rroonga 11.0.0 → 12.0.2

data/ext/groonga/rb-grn-variable-size-column.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2021  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2009-2022  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2014-2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -193,23 +193,24 @@ rb_grn_variable_size_column_array_reference (VALUE self, VALUE rb_id)
     rb_value = rb_ary_new2(n);
     for (i = 0; i < n; i++) {
         VALUE rb_element_value;
-        unsigned int weight = 0;
+        float weight = 0.0;
         grn_id domain;
         VALUE rb_element;
 
         if (value->header.type == GRN_UVECTOR) {
             grn_id id;
-            id = grn_uvector_get_element(context, value, i, &weight);
+            id = grn_uvector_get_element_record(context, value, i, &weight);
             rb_element_value = rb_grn_record_new(rb_range, id, Qnil);
         } else {
             const char *element_value;
             unsigned int element_value_length;
-            element_value_length = grn_vector_get_element(context,
-                                                          value,
-                                                          i,
-                                                          &element_value,
-                                                          &weight,
-                                                          &domain);
+            element_value_length =
+                grn_vector_get_element_float(context,
+                                             value,
+                                             i,
+                                             &element_value,
+                                             &weight,
+                                             &domain);
             rb_element_value = rb_str_new(element_value, element_value_length);
         }
 
@@ -217,9 +218,15 @@ rb_grn_variable_size_column_array_reference (VALUE self, VALUE rb_id)
         rb_hash_aset(rb_element,
                      RB_GRN_INTERN("value"),
                      rb_element_value);
-        rb_hash_aset(rb_element,
-                     RB_GRN_INTERN("weight"),
-                     UINT2NUM(weight));
+        if (flags & GRN_OBJ_WEIGHT_FLOAT32) {
+            rb_hash_aset(rb_element,
+                         RB_GRN_INTERN("weight"),
+                         rb_float_new(weight));
+        } else {
+            rb_hash_aset(rb_element,
+                         RB_GRN_INTERN("weight"),
+                         UINT2NUM((uint32_t)weight));
+        }
 
         rb_ary_push(rb_value, rb_element);
     }
@@ -240,22 +247,22 @@ hash_element_to_vector_element(VALUE key, VALUE value, VALUE user_data)
 {
     HashElementToVectorElementData *data =
         (HashElementToVectorElementData *)user_data;
-    unsigned int weight;
+    float weight;
 
-    weight = NUM2UINT(value);
+    weight = (float)NUM2DBL(value);
 
     if (data->vector->header.type == GRN_UVECTOR) {
         grn_id id = RVAL2GRNID(key, data->context, data->range, data->self);
-        grn_uvector_add_element(data->context, data->vector, id, weight);
+        grn_uvector_add_element_record(data->context, data->vector, id, weight);
     } else {
         GRN_BULK_REWIND(data->element_value);
         RVAL2GRNBULK(key, data->context, data->element_value);
 
-        grn_vector_add_element(data->context, data->vector,
-                               GRN_BULK_HEAD(data->element_value),
-                               GRN_BULK_VSIZE(data->element_value),
-                               weight,
-                               data->element_value->header.domain);
+        grn_vector_add_element_float(data->context, data->vector,
+                                     GRN_BULK_HEAD(data->element_value),
+                                     GRN_BULK_VSIZE(data->element_value),
+                                     weight,
+                                     data->element_value->header.domain);
     }
 
     return ST_CONTINUE;
@@ -405,7 +412,7 @@ rb_grn_variable_size_column_array_set (VALUE self, VALUE rb_id, VALUE rb_value)
         int i, n;
         n = RARRAY_LEN(rb_value);
         for (i = 0; i < n; i++) {
-            unsigned int weight = 0;
+            float weight = 0;
             VALUE rb_element_value, rb_weight;
 
             rb_grn_scan_options(RARRAY_PTR(rb_value)[i],
@@ -414,23 +421,23 @@ rb_grn_variable_size_column_array_set (VALUE self, VALUE rb_id, VALUE rb_value)
                                 NULL);
 
             if (!NIL_P(rb_weight)) {
-                weight = NUM2UINT(rb_weight);
+                weight = (float)NUM2DBL(rb_weight);
             }
 
             if (value->header.type == GRN_UVECTOR) {
                 grn_id id = RVAL2GRNID(rb_element_value, context, range, self);
-                grn_uvector_add_element(context, value, id, weight);
+                grn_uvector_add_element_record(context, value, id, weight);
             } else {
                 GRN_BULK_REWIND(element_value);
                 if (!NIL_P(rb_element_value)) {
                     RVAL2GRNBULK(rb_element_value, context, element_value);
                 }
 
-                grn_vector_add_element(context, value,
-                                       GRN_BULK_HEAD(element_value),
-                                       GRN_BULK_VSIZE(element_value),
-                                       weight,
-                                       element_value->header.domain);
+                grn_vector_add_element_float(context, value,
+                                             GRN_BULK_HEAD(element_value),
+                                             GRN_BULK_VSIZE(element_value),
+                                             weight,
+                                             element_value->header.domain);
             }
         }
     } else if (RVAL2CBOOL(rb_obj_is_kind_of(rb_value, rb_cHash))) {

data/ext/groonga/rb-grn.h

@@ -91,9 +91,9 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_HAVE_FLOAT32 GRN_VERSION_OR_LATER(10, 0, 2)
 
-#define RB_GRN_MAJOR_VERSION 11
+#define RB_GRN_MAJOR_VERSION 12
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 0
+#define RB_GRN_MICRO_VERSION 2
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

data/lib/groonga/schema.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2022  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2014-2015  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -867,6 +865,36 @@ module Groonga
       #   * `:lz4`: Compzressed by LZ4.
       #   * `:zstd`: Compressed by Zstandard.
       #   * `:zstandard`: Compressed by Zstandard.
+      # @option options [Boolean] :weight_float32 (false)
+      #    It specifies whether the column uses 32 bit float for weight or not.
+      #
+      #    You can't use this option for scalar column.
+      #
+      #   @since 12.0.2
+      # @option options [:add, :ignore, :nil, nil] :missing_mode (nil)
+      #   It specifies how to process missing value.
+      #
+      #   * `:add`, `nil`: Correspond to `MISSING_ADD`
+      #   * `:ignore`: Correspond to `MISSING_IGNORE`
+      #   * `:nil`: Correspond to `MISSING_NIL`
+      #
+      #   See
+      #   https://groonga.org/docs/reference/commands/column_create.html#column-create-missing-mode
+      #   for each `MISSING_*` values.
+      #
+      #   @since 12.0.2
+      # @option options [:error, :warn, :ignore, nil] :invalid_mode (nil)
+      #   It specifies how to process invalid value.
+      #
+      #   * `:add`, `nil`: Correspond to `INVALID_ERROR`
+      #   * `:warn`: Correspond to `INVALID_WARN`
+      #   * `:ignore`: Correspond to `INVALID_IGNORE`
+      #
+      #   See
+      #   https://groonga.org/docs/reference/commands/column_create.html#column-create-invalid-mode
+      #   for each `INVALID_*` values.
+      #
+      #   @since 12.0.2
       def column(name, type, options={})
         definition = self[name, ColumnDefinition]
         if definition.nil?
@@ -1540,6 +1568,9 @@ module Groonga
           :type => @options[:type],
           :with_weight => @options[:with_weight],
           :compress => @options[:compress],
+          :weight_float32 => @options[:weight_float32],
+          :missing_mode => @options[:missing_mode],
+          :invalid_mode => @options[:invalid_mode],
         }
       end
 

data/rroonga-build.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2022  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2015-2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -16,12 +16,12 @@
 
 module RroongaBuild
   module RequiredGroongaVersion
-    MAJOR = 11
+    MAJOR = 12
     MINOR = 0
-    MICRO = 0
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
     STRING = VERSION.join(".")
-    RELEASED_DATE = Time.utc(2021, 2, 9)
+    RELEASED_DATE = Time.utc(2022, 3, 29)
   end
 
   module_function

data/test/test-column.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2009-2022  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -431,12 +431,19 @@ class ColumnTest < Test::Unit::TestCase
     def setup_schema
       Groonga::Schema.define do |schema|
         schema.create_table("Shops", :type => :hash) do |table|
-          table.short_text("tags", :type => :vector)
+          table.short_text("tags",
+                           type: :vector,
+                           with_weight: true)
+          table.short_text("tags_float32",
+                           type: :vector,
+                           with_weight: true,
+                           weight_float32: true)
         end
 
         schema.create_table("Tags",
                             :type => :patricia_trie) do |table|
-          table.index("Shops.tags", :with_weight => true)
+          table.index("Shops.tags",
+                      with_weight: true)
         end
       end
 
@@ -453,6 +460,33 @@ class ColumnTest < Test::Unit::TestCase
                    select_by_tag("curry"))
     end
 
+    def test_vector_weight_float32
+      @shops.add("Soul Food India",
+                 :tags_float32 => [
+                   {:value => "curry", :weight => 11.1},
+                   {:value => "hot",   :weight => 33.3},
+                 ])
+      actual = @shops.collect do |shop|
+        attributes = shop.attributes
+        attributes["tags_float32"].each do |tag|
+          tag[:weight] = tag[:weight].round(1)
+        end
+        attributes
+      end
+      assert_equal([
+                     {
+                       "_id" => 1,
+                       "_key" => "Soul Food India",
+                       "tags" => [],
+                       "tags_float32" => [
+                         {:value => "curry", :weight => 11.1},
+                         {:value => "hot",   :weight => 33.3},
+                       ]
+                     },
+                   ],
+                   actual)
+    end
+
     def test_offline_index
       @shops.add("Soul Food India",
                  :tags => [

data/test/test-data-column.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2022  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -119,4 +119,198 @@ class DataColumnTest < Test::Unit::TestCase
                    comments.collect {|comment| [comment.base, comment.plus1]})
     end
   end
+
+  sub_test_case "#missing_mode" do
+    def test_add
+      Groonga::Schema.define do |schema|
+        schema.create_table("Tags",
+                            type: :hash,
+                            key_type: :short_text) do |table|
+        end
+        schema.create_table("Memos") do |table|
+          table.reference("tags",
+                          "Tags",
+                          type: :vector,
+                          missing_mode: :add)
+        end
+      end
+      memos = Groonga["Memos"]
+      memos_tags = Groonga["Memos.tags"]
+      tags = Groonga["Tags"]
+
+      record = memos.add(tags: ["nonexistent"])
+
+      assert_equal({
+                     missing_mode: :add,
+                     missing_add: true,
+                     missing_ignore: false,
+                     missing_nil: false,
+                     values: [tags["nonexistent"]],
+                   },
+                   {
+                     missing_mode: memos_tags.missing_mode,
+                     missing_add: memos_tags.missing_add?,
+                     missing_ignore: memos_tags.missing_ignore?,
+                     missing_nil: memos_tags.missing_nil?,
+                     values: record.tags,
+                   })
+    end
+
+    def test_ignore
+      Groonga::Schema.define do |schema|
+        schema.create_table("Tags",
+                            type: :hash,
+                            key_type: :short_text) do |table|
+        end
+        schema.create_table("Memos") do |table|
+          table.reference("tags",
+                          "Tags",
+                          type: :vector,
+                          missing_mode: :ignore)
+        end
+      end
+      memos = Groonga["Memos"]
+      memos_tags = Groonga["Memos.tags"]
+
+      record = memos.add(tags: ["nonexistent"])
+
+      assert_equal({
+                     missing_mode: :ignore,
+                     missing_add: false,
+                     missing_ignore: true,
+                     missing_nil: false,
+                     values: [],
+                   },
+                   {
+                     missing_mode: memos_tags.missing_mode,
+                     missing_add: memos_tags.missing_add?,
+                     missing_ignore: memos_tags.missing_ignore?,
+                     missing_nil: memos_tags.missing_nil?,
+                     values: record.tags,
+                   })
+    end
+
+    def test_nil
+      Groonga::Schema.define do |schema|
+        schema.create_table("Tags",
+                            type: :hash,
+                            key_type: :short_text) do |table|
+        end
+        schema.create_table("Memos") do |table|
+          table.reference("tags",
+                          "Tags",
+                          type: :vector,
+                          missing_mode: :nil,
+                          invalid_mode: :ignore)
+        end
+      end
+      memos = Groonga["Memos"]
+      memos_tags = Groonga["Memos.tags"]
+
+      record = memos.add(tags: ["nonexistent"])
+
+      assert_equal({
+                     missing_mode: :nil,
+                     missing_add: false,
+                     missing_ignore: false,
+                     missing_nil: true,
+                     values: [nil],
+                   },
+                   {
+                     missing_mode: memos_tags.missing_mode,
+                     missing_add: memos_tags.missing_add?,
+                     missing_ignore: memos_tags.missing_ignore?,
+                     missing_nil: memos_tags.missing_nil?,
+                     values: record.tags,
+                   })
+    end
+  end
+
+  sub_test_case "#invalid_mode" do
+    def test_error
+      Groonga::Schema.define do |schema|
+        schema.create_table("Memos") do |table|
+          table.uint32("count", invalid_mode: :error)
+        end
+      end
+      memos = Groonga["Memos"]
+      memos_count = Groonga["Memos.count"]
+
+      record = memos.add
+      assert_raise(Groonga::InvalidArgument) do
+        record.count = "invalid"
+      end
+
+      assert_equal({
+                     invalid_mode: :error,
+                     invalid_error: true,
+                     invalid_warn: false,
+                     invalid_ignore: false,
+                     value: 0,
+                   },
+                   {
+                     invalid_mode: memos_count.invalid_mode,
+                     invalid_error: memos_count.invalid_error?,
+                     invalid_warn: memos_count.invalid_warn?,
+                     invalid_ignore: memos_count.invalid_ignore?,
+                     value: record.count,
+                   })
+    end
+
+    def test_warn
+      Groonga::Schema.define do |schema|
+        schema.create_table("Memos") do |table|
+          table.uint32("count", invalid_mode: :warn)
+        end
+      end
+      memos = Groonga["Memos"]
+      memos_count = Groonga["Memos.count"]
+
+      record = memos.add
+      record.count = "invalid"
+
+      assert_equal({
+                     invalid_mode: :warn,
+                     invalid_error: false,
+                     invalid_warn: true,
+                     invalid_ignore: false,
+                     value: 0,
+                   },
+                   {
+                     invalid_mode: memos_count.invalid_mode,
+                     invalid_error: memos_count.invalid_error?,
+                     invalid_warn: memos_count.invalid_warn?,
+                     invalid_ignore: memos_count.invalid_ignore?,
+                     value: record.count,
+                   })
+    end
+
+    def test_ignore
+      Groonga::Schema.define do |schema|
+        schema.create_table("Memos") do |table|
+          table.uint32("count", invalid_mode: :ignore)
+        end
+      end
+      memos = Groonga["Memos"]
+      memos_count = Groonga["Memos.count"]
+
+      record = memos.add
+      record.count = "invalid"
+
+      assert_equal({
+                     invalid_mode: :ignore,
+                     invalid_error: false,
+                     invalid_warn: false,
+                     invalid_ignore: true,
+                     value: 0,
+                   },
+                   {
+                     invalid_mode: memos_count.invalid_mode,
+                     invalid_error: memos_count.invalid_error?,
+                     invalid_warn: memos_count.invalid_warn?,
+                     invalid_ignore: memos_count.invalid_ignore?,
+                     value: record.count,
+                   })
+    end
+  end
 end

data/test/test-logger.rb

@@ -39,6 +39,8 @@ class LoggerTest < Test::Unit::TestCase
       FileUtils.mv(@log_path, "#{@log_path}.old")
     end
     assert_false(@log_path.exist?)
+    # Reopen log uses debug level since Groonga 11.0.1.
+    Groonga::Logger.max_level = :debug
     Groonga::Logger.reopen
     assert_true(@log_path.exist?)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 12.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-client
@@ -166,10 +166,10 @@ email:
 - y.hayamizu@gmail.com
 - dara@shidara.net
 executables:
+- grndump
 - grntest-log-analyze
-- groonga-index-dump
 - groonga-database-inspect
-- grndump
+- groonga-index-dump
 extensions:
 - ext/groonga/extconf.rb
 extra_rdoc_files:
@@ -370,7 +370,7 @@ homepage: http://ranguba.org/#about-rroonga
 licenses:
 - LGPL-2.1
 metadata:
-  msys2_mingw_dependencies: groonga>=11.0.0
+  msys2_mingw_dependencies: groonga>=12.0.2
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -387,80 +387,80 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Groonga that provide full text search and column store
   features.
 test_files:
-- test/test-table-dumper.rb
-- test/test-query-logger.rb
-- test/test-variable-size-column.rb
-- test/test-schema-dumper.rb
-- test/test-double-array-trie.rb
-- test/test-expression-builder.rb
+- test/groonga-test-utils.rb
+- test/run-test.rb
+- test/test-accessor.rb
 - test/test-array.rb
-- test/test-id.rb
-- test/test-table-key-support.rb
+- test/test-column-cache.rb
+- test/test-column.rb
+- test/test-command-select.rb
+- test/test-config.rb
+- test/test-context.rb
+- test/test-convert.rb
+- test/test-data-column.rb
 - test/test-database-dumper.rb
+- test/test-database-inspector.rb
+- test/test-database.rb
+- test/test-default-cache.rb
+- test/test-double-array-trie.rb
+- test/test-encoding.rb
+- test/test-error-message.rb
+- test/test-exception.rb
+- test/test-expression-builder.rb
 - test/test-expression.rb
+- test/test-fix-size-column.rb
+- test/test-flushable.rb
+- test/test-geo-point.rb
+- test/test-gqtp.rb
+- test/test-hash.rb
+- test/test-id.rb
+- test/test-index-column.rb
+- test/test-index-cursor.rb
+- test/test-lock-timeout.rb
 - test/test-logger.rb
-- test/run-test.rb
-- test/test-windows-event-logger.rb
-- test/test-vector-column.rb
+- test/test-memory-pool.rb
+- test/test-name.rb
+- test/test-normalizer.rb
 - test/test-operator.rb
-- test/test-table.rb
-- test/test-table-group.rb
-- test/test-column.rb
+- test/test-package-label.rb
 - test/test-pagination.rb
-- test/test-error-message.rb
-- test/test-fix-size-column.rb
-- test/test-table-arrow.rb
-- test/test-sub-records.rb
-- test/test-table-select-normalize.rb
-- test/test-config.rb
 - test/test-patricia-trie.rb
-- test/test-gqtp.rb
-- test/test-memory-pool.rb
+- test/test-plugin.rb
+- test/test-procedure.rb
+- test/test-query-logger.rb
+- test/test-ractor.rb
+- test/test-record.rb
+- test/test-remote.rb
+- test/test-request-canceler.rb
+- test/test-request-timer.rb
 - test/test-schema-create-table.rb
+- test/test-schema-dumper.rb
+- test/test-schema-type.rb
 - test/test-schema.rb
-- test/test-column-cache.rb
-- test/test-command-select.rb
-- test/test-lock-timeout.rb
-- test/test-request-canceler.rb
-- test/test-default-cache.rb
-- test/test-database.rb
-- test/test-token-regexp.rb
+- test/test-snippet.rb
+- test/test-sub-records.rb
+- test/test-table-arrow.rb
+- test/test-table-dumper.rb
+- test/test-table-group.rb
+- test/test-table-key-support.rb
+- test/test-table-offset-and-limit.rb
+- test/test-table-select-mecab.rb
+- test/test-table-select-normalize.rb
 - test/test-table-select-weight.rb
-- test/test-database-inspector.rb
-- test/test-encoding.rb
-- test/test-hash.rb
-- test/test-schema-type.rb
-- test/test-type.rb
-- test/test-context.rb
-- test/test-flushable.rb
-- test/test-normalizer.rb
 - test/test-table-select.rb
-- test/test-index-cursor.rb
-- test/test-remote.rb
-- test/test-snippet.rb
-- test/test-exception.rb
-- test/groonga-test-utils.rb
 - test/test-table-traverse.rb
-- test/test-convert.rb
+- test/test-table.rb
 - test/test-thread.rb
-- test/test-plugin.rb
-- test/test-accessor.rb
-- test/test-index-column.rb
-- test/test-data-column.rb
-- test/test-ractor.rb
-- test/test-geo-point.rb
-- test/test-request-timer.rb
-- test/test-table-select-mecab.rb
-- test/test-version.rb
-- test/test-package-label.rb
+- test/test-token-regexp.rb
+- test/test-type.rb
+- test/test-variable-size-column.rb
 - test/test-variable.rb
-- test/test-record.rb
-- test/test-table-offset-and-limit.rb
-- test/test-procedure.rb
-- test/test-name.rb
+- test/test-vector-column.rb
+- test/test-version.rb
+- test/test-windows-event-logger.rb