rroonga 4.0.6-x86-mingw32 → 4.0.7-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 655aad0f4394498613e4b2f6bdc11c63aeec5d50
-  data.tar.gz: e0b29627fa3ec06d4fb2335f3ceed8751135a434
+  metadata.gz: 01c215baffc5953265a2b3d3daab2218af67c230
+  data.tar.gz: 60a05928d72aac5091ec651971eb6e26a382d5eb
 SHA512:
-  metadata.gz: 117779194b08baa5d9104b6b344a3057db9e436605436386f403b16ef57e328a1cc2ac86342807f4cb137f18067f7638088dad62ea2ce6d35e70a59b9a1f64a2
-  data.tar.gz: 82edc782346a55cec90c48ffa7911927081e78203c14cf795e1758cd715f124ee31b2cac3fd2bfb32e86ee847df2c707fc0134b010d5f662ccadd0efb2807a37
+  metadata.gz: 6f7e48ce5a680f5c22ea41d903a77851ea769731ee0c66bbcc32b282305db208b12524731b942c1ee44ae8c28a81f38465bd2a32b782dbc8e0a9725985863964
+  data.tar.gz: 7a944d31f0ebd28c4b048be1f2280e01fa8270b84be4f961c920663b6b878af66a2fac746caf5cb201b1fd594c339f55e3013d6216bf2900c51dc30c72b69651

data/README.md

@@ -40,7 +40,7 @@ contributed patches.)
 ## Dependencies
 
 * Ruby >= 1.9.3
-* Groonga >= 4.0.4
+* Groonga >= 4.0.7
 
 ## Install
 

data/doc/text/news.textile

@@ -1,5 +1,17 @@
 h1. NEWS
 
+h2(#4-0-7). 4.0.7: 2014-12-12
+
+h3. Improvements
+
+* Supported Groonga 4.0.8. Groonga 4.0.7 or older aren't supported.
+* Added @:reuse_posting_object@ option to
+  {Groonga::IndexCursor#each}. The option improves performance by
+  reducing memory allocation. The option is disabled by default because
+  reusing the same object isn't Rubyish.
+* Added {Groonga::IndexCursor#estimate_size}. [GitHub#38]
+* Accepted string for integer, unsigned integer and float type key.
+
 h2(#4-0-6). 4.0.6: 2014-11-06
 
 h3. Improvements
@@ -11,8 +23,8 @@ h3. Improvements
 ** Supported @:lz4@ in {Groonga::VariableSizeColumn#compressed?} options.
 ** Added {Groonga::LZ4Error}.
 ** [grndump] Supported @COMPRESS_ZLIB@ and @COMPRESS_LZ4@ flags.
-** Added {Groonga::TableKeySupport#token_filters}.
-** Added {Groonga::TableKeySupport#token_filters=}.
+** Added {Groonga::Table::KeySupport#token_filters}.
+** Added {Groonga::Table::KeySupport#token_filters=}.
 ** Supported @:token_filters@ in {Groonga::Hash.create} options.
 ** Supported @:token_filters@ in {Groonga::PatriciaTrie.create} options.
 ** Supported @:token_filters@ in {Groonga::DoubleArrayTrie.create} options.

data/ext/groonga/extconf.rb

@@ -283,9 +283,6 @@ have_func("rb_sym2str", "ruby.h")
 have_func("rb_to_symbol", "ruby.h")
 have_type("enum ruby_value_type", "ruby.h")
 
-# TODO: Remove me after Groogna 4.0.8 is released.
-have_func("grn_expr_dump_plan", "groonga.h")
-
 checking_for(checking_message("--enable-debug-log option")) do
   enable_debug_log = enable_config("debug-log", false)
   if enable_debug_log

data/ext/groonga/rb-grn-expression.c

@@ -498,13 +498,11 @@ rb_grn_expression_compile (VALUE self)
  * Dump execution plan of the `expression` in string.
  *
  * @overload dump_plan
- * @since 4.0.8
+ * @since 4.0.7
  */
 static VALUE
 rb_grn_expression_dump_plan (VALUE self)
 {
-/* TODO: Remove me after Groogna 4.0.8 is released. */
-#ifdef HAVE_GRN_EXPR_DUMP_PLAN
     grn_ctx *context = NULL;
     grn_obj *expression;
     grn_obj dumped_plan;
@@ -520,9 +518,6 @@ rb_grn_expression_dump_plan (VALUE self)
     grn_obj_unlink(context, &dumped_plan);
 
     return rb_dumped_plan;
-#else
-    return rb_str_new2("");
-#endif
 }
 
 /*

data/ext/groonga/rb-grn-index-column.c

@@ -955,6 +955,99 @@ rb_grn_index_column_open_cursor (int argc, VALUE *argv, VALUE self)
         return rb_cursor;
 }
 
+/*
+ * Estimates the number of documents found by the given token ID.
+ *
+ * @example Token ID style
+ *    # Define schema
+ *    Groonga::Schema.define do |schema|
+ *      schema.create_table("Articles") do |table|
+ *        table.text("content")
+ *      end
+ *
+ *      schema.create_table("Terms",
+ *                          :type => :hash,
+ *                          :key_type => "ShortText",
+ *                          :default_tokenizer => "TokenBigram",
+ *                          :normalizer => "NormalizerAuto") do |table|
+ *        table.index("Articles.content",
+ *                    :name => "articles_content",
+ *                    :with_position => true,
+ *                    :with_section => true)
+ *      end
+ *    end
+ *    articles = Groonga["Articles"]
+ *    terms = Groonga["Terms"]
+ *    index = Groonga["Terms.articles_content"]
+ *
+ *    # Add data
+ *    articles.add(:content => "Groonga is fast")
+ *    articles.add(:content => "Rroonga is fast")
+ *    articles.add(:content => "Mroonga is fast")
+ *
+ *    # Estimate the number of documents found by token ID
+ *    p @index.estimate_size(@terms["fast"].id)    # => 7
+ *    p @index.estimate_size(@terms["Groonga"].id) # => 1
+ *
+ * @example Token record style
+ *    # Define schema
+ *    Groonga::Schema.define do |schema|
+ *      schema.create_table("Articles") do |table|
+ *        table.text("content")
+ *      end
+ *
+ *      schema.create_table("Terms",
+ *                          :type => :hash,
+ *                          :key_type => "ShortText",
+ *                          :default_tokenizer => "TokenBigram",
+ *                          :normalizer => "NormalizerAuto") do |table|
+ *        table.index("Articles.content",
+ *                    :name => "articles_content",
+ *                    :with_position => true,
+ *                    :with_section => true)
+ *      end
+ *    end
+ *    articles = Groonga["Articles"]
+ *    terms = Groonga["Terms"]
+ *    index = Groonga["Terms.articles_content"]
+ *
+ *    # Add data
+ *    articles.add(:content => "Groonga is fast")
+ *    articles.add(:content => "Rroonga is fast")
+ *    articles.add(:content => "Mroonga is fast")
+ *
+ *    # Estimate the number of documents found by token record
+ *    p @index.estimate_size(@terms["fast"])    # => 7
+ *    p @index.estimate_size(@terms["Groonga"]) # => 1
+ *
+ * @overload estimate_size(token_id)
+ *   @param [Integer, Record] token_id The token ID to be estimated.
+ *   @return [Integer] The estimated number of documents found by the
+ *     given token ID.
+ *
+ * @since 4.0.7
+ */
+static VALUE
+rb_grn_index_column_estimate_size (VALUE self, VALUE rb_token_id)
+{
+    grn_ctx *context;
+    grn_obj *column;
+    grn_obj *domain_object;
+    grn_id token_id;
+    unsigned int size;
+
+    rb_grn_index_column_deconstruct(SELF(self), &column, &context,
+                                    NULL, &domain_object,
+                                    NULL, NULL, NULL,
+                                    NULL, NULL,
+                                    NULL, NULL);
+
+    token_id = RVAL2GRNID(rb_token_id, context, domain_object, self);
+    size = grn_ii_estimate_size(context, (grn_ii *)column, token_id);
+
+    return UINT2NUM(size);
+}
+
 void
 rb_grn_init_index_column (VALUE mGrn)
 {
@@ -990,4 +1083,7 @@ rb_grn_init_index_column (VALUE mGrn)
 
     rb_define_method(rb_cGrnIndexColumn, "open_cursor",
                      rb_grn_index_column_open_cursor, -1);
+
+    rb_define_method(rb_cGrnIndexColumn, "estimate_size",
+                     rb_grn_index_column_estimate_size, 1);
 }

data/ext/groonga/rb-grn-index-cursor.c

@@ -57,7 +57,8 @@ rb_grn_index_cursor_deconstruct (RbGrnIndexCursor *rb_grn_index_cursor,
 }
 
 static VALUE
-next_value (grn_ctx *context, grn_obj *cursor, VALUE rb_table, VALUE rb_lexicon)
+next_value (VALUE rb_posting,
+            grn_ctx *context, grn_obj *cursor, VALUE rb_table, VALUE rb_lexicon)
 {
     grn_posting *posting;
     grn_id term_id;
@@ -67,7 +68,12 @@ next_value (grn_ctx *context, grn_obj *cursor, VALUE rb_table, VALUE rb_lexicon)
         return Qnil;
     }
 
-    return rb_grn_posting_new(posting, term_id, rb_table, rb_lexicon);
+    if (NIL_P(rb_posting)) {
+        return rb_grn_posting_new(posting, term_id, rb_table, rb_lexicon);
+    } else {
+        rb_grn_posting_update(rb_posting, posting, term_id);
+        return rb_posting;
+    }
 }
 
 static VALUE
@@ -84,7 +90,7 @@ rb_grn_index_cursor_next (VALUE self)
         VALUE rb_lexicon;
         rb_table = rb_iv_get(self, "@table");
         rb_lexicon = rb_iv_get(self, "@lexicon");
-        rb_posting = next_value(context, cursor, rb_table, rb_lexicon);
+        rb_posting = next_value(Qnil, context, cursor, rb_table, rb_lexicon);
     }
 
     return rb_posting;
@@ -92,14 +98,24 @@ rb_grn_index_cursor_next (VALUE self)
 }
 
 static VALUE
-rb_grn_index_cursor_each (VALUE self)
+rb_grn_index_cursor_each (int argc, VALUE *argv, VALUE self)
 {
     grn_obj *cursor;
     grn_ctx *context;
+    grn_bool reuse_posting_object;
+    VALUE rb_options;
+    VALUE rb_reuse_posting_object;
     VALUE rb_table;
     VALUE rb_lexicon;
+    VALUE rb_posting = Qnil;
+
+    RETURN_ENUMERATOR(self, argc, argv);
+
+    rb_scan_args(argc, argv, "01", &rb_options);
 
-    RETURN_ENUMERATOR(self, 0, NULL);
+    rb_grn_scan_options(rb_options,
+                        "reuse_posting_object", &rb_reuse_posting_object,
+                        NULL);
 
     rb_grn_index_cursor_deconstruct(SELF(self), &cursor, &context,
                                     NULL, NULL, NULL, NULL);
@@ -114,9 +130,17 @@ rb_grn_index_cursor_each (VALUE self)
 
     rb_table = rb_iv_get(self, "@table");
     rb_lexicon = rb_iv_get(self, "@lexicon");
+    reuse_posting_object = RVAL2CBOOL(rb_reuse_posting_object);
+
+    if (reuse_posting_object) {
+        rb_posting = rb_grn_posting_new(NULL, GRN_ID_NIL, rb_table, rb_lexicon);
+    }
     while (GRN_TRUE) {
-        VALUE rb_posting;
-        rb_posting = next_value(context, cursor, rb_table, rb_lexicon);
+        if (!reuse_posting_object) {
+            rb_posting = Qnil;
+        }
+        rb_posting = next_value(rb_posting,
+                                context, cursor, rb_table, rb_lexicon);
         if (NIL_P(rb_posting)) {
             break;
         }
@@ -135,5 +159,5 @@ rb_grn_init_index_cursor (VALUE mGrn)
     rb_include_module(rb_cGrnIndexCursor, rb_mEnumerable);
 
     rb_define_method(rb_cGrnIndexCursor, "next", rb_grn_index_cursor_next, 0);
-    rb_define_method(rb_cGrnIndexCursor, "each", rb_grn_index_cursor_each, 0);
+    rb_define_method(rb_cGrnIndexCursor, "each", rb_grn_index_cursor_each, -1);
 }

data/ext/groonga/rb-grn-posting.c

@@ -32,13 +32,15 @@ rb_grn_posting_new (grn_posting *posting, grn_id term_id,
 #define SET_PARAMETER(key, value) \
     rb_hash_aset(parameters, RB_GRN_INTERN(key), INT2NUM((value)))
 
-    SET_PARAMETER("record_id", posting->rid);
-    SET_PARAMETER("section_id", posting->sid);
+    if (posting) {
+        SET_PARAMETER("record_id", posting->rid);
+        SET_PARAMETER("section_id", posting->sid);
+        SET_PARAMETER("position", posting->pos);
+        SET_PARAMETER("term_frequency", posting->tf);
+        SET_PARAMETER("weight", posting->weight);
+        SET_PARAMETER("n_rest_postings", posting->rest);
+    }
     SET_PARAMETER("term_id", term_id);
-    SET_PARAMETER("position", posting->pos);
-    SET_PARAMETER("term_frequency", posting->tf);
-    SET_PARAMETER("weight", posting->weight);
-    SET_PARAMETER("n_rest_postings", posting->rest);
 
 #undef SET_PARAMETER
 
@@ -49,6 +51,24 @@ rb_grn_posting_new (grn_posting *posting, grn_id term_id,
                       parameters);
 }
 
+void
+rb_grn_posting_update (VALUE self, grn_posting *posting, grn_id term_id)
+{
+#define SET_PARAMETER(key, value) \
+    rb_funcall(self, rb_intern(key "="), 1, INT2NUM(value));
+
+    SET_PARAMETER("record_id",       posting->rid);
+    SET_PARAMETER("section_id",      posting->sid);
+    SET_PARAMETER("position",        posting->pos);
+    SET_PARAMETER("term_frequency",  posting->tf);
+    SET_PARAMETER("weight",          posting->weight);
+    SET_PARAMETER("n_rest_postings", posting->rest);
+
+    SET_PARAMETER("term_id",         term_id);
+
+#undef SET_PARAMETER
+}
+
 void
 rb_grn_init_posting (VALUE mGrn)
 {

data/ext/groonga/rb-grn-utils.c

@@ -481,46 +481,73 @@ rb_grn_bulk_from_ruby_object_with_type (VALUE object, grn_ctx *context,
 
     switch (type_id) {
     case GRN_DB_INT8:
+        if (string_p) {
+            object = rb_Integer(object);
+        }
         value.int8_value = NUM2SHORT(object);
         string = (const char *)&(value.int8_value);
         size = sizeof(value.int8_value);
         break;
     case GRN_DB_UINT8:
+        if (string_p) {
+            object = rb_Integer(object);
+        }
         value.uint8_value = NUM2USHORT(object);
         string = (const char *)&(value.uint8_value);
         size = sizeof(value.uint8_value);
         break;
     case GRN_DB_INT16:
+        if (string_p) {
+            object = rb_Integer(object);
+        }
         value.int16_value = NUM2SHORT(object);
         string = (const char *)&(value.int16_value);
         size = sizeof(value.int16_value);
         break;
     case GRN_DB_UINT16:
+        if (string_p) {
+            object = rb_Integer(object);
+        }
         value.uint16_value = NUM2USHORT(object);
         string = (const char *)&(value.uint16_value);
         size = sizeof(value.uint16_value);
         break;
     case GRN_DB_INT32:
+        if (string_p) {
+            object = rb_Integer(object);
+        }
         value.int32_value = NUM2INT(object);
         string = (const char *)&(value.int32_value);
         size = sizeof(value.int32_value);
         break;
     case GRN_DB_UINT32:
+        if (string_p) {
+            object = rb_Integer(object);
+        }
         value.uint32_value = NUM2UINT(object);
         string = (const char *)&(value.uint32_value);
         size = sizeof(value.uint32_value);
         break;
     case GRN_DB_INT64:
+        if (string_p) {
+            object = rb_Integer(object);
+        }
         value.int64_value = NUM2LL(object);
         string = (const char *)&(value.int64_value);
         size = sizeof(value.int64_value);
         break;
     case GRN_DB_UINT64:
+        if (string_p) {
+            object = rb_Integer(object);
+        }
         value.uint64_value = NUM2ULL(object);
         string = (const char *)&(value.uint64_value);
         size = sizeof(value.uint64_value);
         break;
     case GRN_DB_FLOAT:
+        if (string_p) {
+            object = rb_Float(object);
+        }
         value.double_value = NUM2DBL(object);
         string = (const char *)&(value.double_value);
         size = sizeof(value.double_value);

data/ext/groonga/rb-grn.h

@@ -92,7 +92,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 4
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 6
+#define RB_GRN_MICRO_VERSION 7
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -568,6 +568,9 @@ VALUE          rb_grn_posting_new                   (grn_posting *posting,
                                                      grn_id term_id,
                                                      VALUE rb_table,
                                                      VALUE rb_lexicon);
+void           rb_grn_posting_update                (VALUE rb_posting,
+                                                     grn_posting *posting,
+                                                     grn_id term_id);
 
 VALUE          rb_grn_tokyo_geo_point_new           (int   latitude,
                                                      int   longitude);

data/rroonga-build.rb

@@ -19,15 +19,15 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 4
     MINOR = 0
-    MICRO = 7
+    MICRO = 8
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2014, 10, 29)
+    RELEASED_DATE = Time.utc(2014, 11, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 4
     MINOR = 0
-    MICRO = 7
+    MICRO = 8
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-column.rb

@@ -169,9 +169,18 @@ class ColumnTest < Test::Unit::TestCase
                  result.records.collect do |record|
                    record["body"]
                  end)
-    assert_equal("#<Groonga::Expression noname($1:null)" +
-                 "{2body GET_VALUE,0\"drive\",0MATCH}>",
-                 result.expression.inspect)
+    assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+    $1:#<record:hash:Posts id:0(nonexistent)>
+  },
+  codes:{
+    0:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
+    1:<push(), modify:0, value:"drive">,
+    2:<match(), modify:0, value:(NULL)>
+  }
+>>
+    INSPECTED
   end
 
   def test_select_query_from_ctx
@@ -200,9 +209,18 @@ class ColumnTest < Test::Unit::TestCase
                  result.records.collect do |record|
                    record["body"]
                  end)
-    assert_equal("#<Groonga::Expression noname($1:null)" +
-                 "{2body GET_VALUE,0\"drive\",0MATCH}>",
-                 result.expression.inspect)
+    assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+    $1:#<record:hash:Posts id:0(nonexistent)>
+  },
+  codes:{
+    0:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
+    1:<push(), modify:0, value:"drive">,
+    2:<match(), modify:0, value:(NULL)>
+  }
+>>
+    INSPECTED
   end
 
   def test_select_expression
@@ -218,9 +236,19 @@ class ColumnTest < Test::Unit::TestCase
                  result.records.collect do |record|
                    record["body"]
                  end)
-    assert_equal("#<Groonga::Expression noname($1:null)" +
-                 "{0null,2body GET_VALUE,0\"drive\",0MATCH}>",
-                 result.expression.inspect)
+    assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+    $1:#<record:hash:Posts id:0(nonexistent)>
+  },
+  codes:{
+    0:<push(), modify:0, value:#<record:hash:Posts id:0(nonexistent)>>,
+    1:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
+    2:<push(), modify:0, value:"drive">,
+    3:<match(), modify:0, value:(NULL)>
+  }
+>>
+    INSPECTED
   end
 
   def test_select_with_block
@@ -233,9 +261,19 @@ class ColumnTest < Test::Unit::TestCase
                  result.records.collect do |record|
                    record["body"]
                  end)
-    assert_equal("#<Groonga::Expression noname($1:null)" +
-                 "{1null,2body GET_VALUE,0\"drive\",0MATCH}>",
-                 result.expression.inspect)
+    assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
+#<Groonga::Expression #<expr
+  vars:{
+    $1:#<record:hash:Posts id:0(nonexistent)>
+  },
+  codes:{
+    0:<push(), modify:1, value:#<record:hash:Posts id:0(nonexistent)>>,
+    1:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
+    2:<push(), modify:0, value:"drive">,
+    3:<match(), modify:0, value:(NULL)>
+  }
+>>
+    INSPECTED
   end
 
   def test_set_time

data/test/test-expression-builder.rb

@@ -569,7 +569,7 @@ EOC
       result = @bookmarks.select do |record|
         record.user.pet.name == "morita Bob"
       end
-      assert_equal(["http://groonga.org/", "http://ruby-lang.org/"],
+      assert_equal(["http://groonga.org/", "http://ruby-lang.org/", "http://dic.nicovideo.jp/"],
                    result.collect {|record| record["uri"]})
     end
   end