rroonga 6.1.3-x64-mingw32 → 7.0.2-x64-mingw32

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

@@ -245,7 +245,7 @@ rb_grn_plugin_s_names (int argc, VALUE *argv, VALUE klass)
 void
 rb_grn_init_plugin (VALUE mGrn)
 {
-    cGrnPlugin = rb_define_class_under(mGrn, "Plugin", rb_cObject);
+    cGrnPlugin = rb_define_class_under(mGrn, "Plugin", rb_cData);
     rb_define_alloc_func(cGrnPlugin, rb_grn_plugin_alloc);
 
     rb_define_singleton_method(cGrnPlugin, "register",

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

@@ -277,7 +277,7 @@ rb_grn_table_cursor_each (VALUE self)
 void
 rb_grn_init_table_cursor (VALUE mGrn)
 {
-    rb_cGrnTableCursor = rb_define_class_under(mGrn, "TableCursor", rb_cObject);
+    rb_cGrnTableCursor = rb_define_class_under(mGrn, "TableCursor", rb_cData);
     rb_define_alloc_func(rb_cGrnTableCursor, rb_grn_object_alloc);
 
     rb_include_module(rb_cGrnTableCursor, rb_mEnumerable);

data/ext/groonga/rb-grn-table-key-support.c

@@ -356,7 +356,11 @@ rb_grn_table_key_support_get_key (VALUE self, VALUE rb_id)
 /*
  * テーブルに主キーが _key_ のレコードがあるならtrueを返す。
  *
+ * @overload key?(key)
+ *    @since 7.0.0
+ *
  * @overload has_key?(key)
+ *    @deprecated Use {key?} instead.
  */
 static VALUE
 rb_grn_table_key_support_has_key (VALUE self, VALUE rb_key)
@@ -1123,6 +1127,8 @@ rb_grn_init_table_key_support (VALUE mGrn)
                      rb_grn_table_key_support_get_id, -1);
     rb_define_method(rb_mGrnTableKeySupport, "key",
                      rb_grn_table_key_support_get_key, 1);
+    rb_define_method(rb_mGrnTableKeySupport, "key?",
+                     rb_grn_table_key_support_has_key, 1);
     rb_define_method(rb_mGrnTableKeySupport, "has_key?",
                      rb_grn_table_key_support_has_key, 1);
 

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

@@ -1377,9 +1377,6 @@ rb_grn_table_geo_sort (int argc, VALUE *argv, VALUE self)
         offset = NUM2INT(rb_offset);
     if (!NIL_P(rb_limit))
         limit = NUM2INT(rb_limit);
-    /* TODO: Remove me when Groonga 5.1.0 is released. */
-    if (limit < 0)
-        limit = grn_table_size(context, table) + limit + 1;
 
     result = grn_table_create(context, NULL, 0, NULL, GRN_TABLE_NO_KEY,
                               NULL, table);

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

@@ -1061,13 +1061,37 @@ rb_grn_value_to_ruby_object (grn_ctx *context,
 
 grn_id
 rb_grn_id_from_ruby_object (VALUE object, grn_ctx *context, grn_obj *table,
-                            VALUE related_object)
+                            VALUE rb_related_object)
 {
     VALUE rb_id;
 
     if (NIL_P(object))
         return Qnil;
 
+    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGrnRecord)) &&
+        !RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cInteger))) {
+        VALUE rb_record;
+        if (table) {
+            VALUE rb_table;
+            rb_table = GRNOBJECT2RVAL(Qnil, context, table, GRN_FALSE);
+            if (!NIL_P(rb_table) &&
+                RVAL2CBOOL(rb_obj_is_kind_of(rb_table,
+                                             rb_mGrnTableKeySupport))) {
+                rb_record = rb_funcall(rb_table, rb_intern("[]"), 1, object);
+                if (NIL_P(rb_record)) {
+                    rb_raise(rb_eArgError,
+                             "nonexistent key: %" PRIsVALUE
+                             ": %" PRIsVALUE
+                             ": %" PRIsVALUE,
+                             object,
+                             rb_table,
+                             rb_related_object);
+                }
+                object = rb_record;
+            }
+        }
+    }
+
     if (RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGrnRecord))) {
         VALUE rb_table;
         rb_table = rb_funcall(object, rb_intern("table"), 0);
@@ -1077,9 +1101,12 @@ rb_grn_id_from_ruby_object (VALUE object, grn_ctx *context, grn_obj *table,
             rb_expected_table =
                 GRNOBJECT2RVAL(Qnil, context, table, GRN_FALSE);
             rb_raise(rb_eGrnError,
-                     "wrong table: expected <%s>: actual <%s>",
-                     rb_grn_inspect(rb_expected_table),
-                     rb_grn_inspect(rb_table));
+                     "wrong table: expected %" PRIsVALUE
+                     ": actual %" PRIsVALUE
+                     ": %" PRIsVALUE,
+                     rb_expected_table,
+                     rb_table,
+                     rb_related_object);
         }
         rb_id = rb_funcall(object, rb_intern("id"), 0);
     } else {
@@ -1088,9 +1115,10 @@ rb_grn_id_from_ruby_object (VALUE object, grn_ctx *context, grn_obj *table,
 
     if (!RVAL2CBOOL(rb_obj_is_kind_of(rb_id, rb_cInteger)))
         rb_raise(rb_eGrnError,
-                 "should be unsigned integer or Groogna::Record: <%s>: <%s>",
-                 rb_grn_inspect(object),
-                 rb_grn_inspect(related_object));
+                 "should be unsigned integer or Groogna::Record: %" PRIsVALUE
+                 ": %" PRIsVALUE,
+                 object,
+                 rb_related_object);
 
     return NUM2UINT(rb_id);
 }

data/ext/groonga/rb-grn.h

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2017  Kouhei Sutou <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
@@ -97,9 +97,9 @@ RB_GRN_BEGIN_DECLS
 #  define debug(...)
 #endif
 
-#define RB_GRN_MAJOR_VERSION 6
-#define RB_GRN_MINOR_VERSION 1
-#define RB_GRN_MICRO_VERSION 3
+#define RB_GRN_MAJOR_VERSION 7
+#define RB_GRN_MINOR_VERSION 0
+#define RB_GRN_MICRO_VERSION 2
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))
@@ -336,6 +336,7 @@ void           rb_grn_init_fix_size_column          (VALUE mGrn);
 void           rb_grn_init_variable_size_column     (VALUE mGrn);
 void           rb_grn_init_index_column             (VALUE mGrn);
 void           rb_grn_init_index_cursor             (VALUE mGrn);
+void           rb_grn_init_inverted_index_cursor    (VALUE mGrn);
 void           rb_grn_init_posting                  (VALUE mGrn);
 void           rb_grn_init_accessor                 (VALUE mGrn);
 void           rb_grn_init_geo_point                (VALUE mGrn);
@@ -367,6 +368,7 @@ void           rb_grn_init_request_timer            (VALUE mGrn);
 void           rb_grn_init_request_timer_id         (VALUE mGrn);
 void           rb_grn_init_id                       (VALUE mGrn);
 void           rb_grn_init_name                     (VALUE mGrn);
+void           rb_grn_init_default_cache            (VALUE mGrn);
 
 VALUE          rb_grn_rc_to_exception               (grn_rc rc);
 void           rb_grn_rc_check                      (grn_rc rc,
@@ -825,6 +827,13 @@ VALUE          rb_grn_index_cursor_to_ruby_object   (grn_ctx *context,
                                                      VALUE rb_table,
                                                      VALUE rb_lexicon,
                                                      grn_bool owner);
+VALUE          rb_grn_inverted_index_cursor_to_ruby_object
+                                                    (grn_ctx *context,
+                                                     grn_ii_cursor *cursor,
+                                                     grn_id term_id,
+                                                     int flags,
+                                                     VALUE rb_table,
+                                                     VALUE rb_lexicon);
 
 grn_operator   rb_grn_operator_from_ruby_object     (VALUE object);
 grn_operator   rb_grn_set_operator_from_ruby_object (VALUE object);

data/ext/groonga/rb-groonga.c

@@ -229,6 +229,7 @@ Init_groonga (void)
     rb_grn_init_table(mGrn);
     rb_grn_init_table_cursor(mGrn);
     rb_grn_init_index_cursor(mGrn);
+    rb_grn_init_inverted_index_cursor(mGrn);
     rb_grn_init_posting(mGrn);
     rb_grn_init_type(mGrn);
     rb_grn_init_procedure(mGrn);
@@ -255,4 +256,5 @@ Init_groonga (void)
     rb_grn_init_request_timer_id(mGrn);
     rb_grn_init_id(mGrn);
     rb_grn_init_name(mGrn);
+    rb_grn_init_default_cache(mGrn);
 }

data/rroonga-build.rb

@@ -16,17 +16,17 @@
 
 module RroongaBuild
   module RequiredGroongaVersion
-    MAJOR = 6
-    MINOR = 1
-    MICRO = 1
+    MAJOR = 7
+    MINOR = 0
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2016, 11, 29)
+    RELEASED_DATE = Time.utc(2017, 4, 29)
   end
 
   module LatestGroongaVersion
-    MAJOR = 6
-    MINOR = 1
-    MICRO = 3
+    MAJOR = 7
+    MINOR = 0
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/rroonga.gemspec

@@ -1,6 +1,7 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
 # Copyright (C) 2012-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2017  Masafumi Yokoyama <yokoyama@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
@@ -88,7 +89,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("test-unit", [">= 3.0.0"])
   s.add_development_dependency("rake")
   s.add_development_dependency("rake-compiler", [">= 0.9.5"])
-  s.add_development_dependency("rake-compiler-dock")
+  s.add_development_dependency("rake-compiler-dock", [">= 0.6.0"])
   s.add_development_dependency("bundler")
   s.add_development_dependency("yard")
   s.add_development_dependency("packnga", [">= 1.0.0"])

data/test/test-data-column.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2017  Kouhei Sutou <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
@@ -21,7 +21,7 @@ class DataColumnTest < Test::Unit::TestCase
   end
 
   sub_test_case "#apply_window_function" do
-    def test_no_argument
+    def test_sort_keys
       Groonga::Schema.define do |schema|
         schema.create_table("Comments") do |table|
           table.uint32("nth")
@@ -49,5 +49,74 @@ class DataColumnTest < Test::Unit::TestCase
                    ],
                    comments.collect {|comment| [comment.id, comment.nth]})
     end
+
+    def test_group_keys
+      Groonga::Schema.define do |schema|
+        schema.create_table("Comments") do |table|
+          table.uint32("nth")
+          table.short_text("category")
+        end
+      end
+      comments = Groonga["Comments"]
+      nth = Groonga["Comments.nth"]
+
+      3.times do
+        comments.add(:category => "a")
+      end
+      3.times do
+        comments.add(:category => "b")
+      end
+
+      options = {
+        :sort_keys => [["_id", "desc"]],
+        :group_keys => ["category"],
+      }
+      nth.apply_window_function(options) do |record|
+        record.call("record_number")
+      end
+      values = comments.collect do |comment|
+        [
+          comment.id,
+          comment.nth,
+          comment.category,
+        ]
+      end
+      assert_equal([
+                     [1,  3, "a"],
+                     [2,  2, "a"],
+                     [3,  1, "a"],
+                     [4,  3, "b"],
+                     [5,  2, "b"],
+                     [6,  1, "b"],
+                   ],
+                   values)
+    end
+  end
+
+  sub_test_case "#apply_expression" do
+    def test_simple
+      Groonga::Schema.define do |schema|
+        schema.create_table("Comments") do |table|
+          table.uint32("base")
+          table.uint32("plus1")
+        end
+      end
+      comments = Groonga["Comments"]
+      plus1 = Groonga["Comments.plus1"]
+
+      3.times do |i|
+        comments.add(:base => i)
+      end
+
+      plus1.apply_expression do |record|
+        record.base + 1
+      end
+      assert_equal([
+                     [0, 1],
+                     [1, 2],
+                     [2, 3],
+                   ],
+                   comments.collect {|comment| [comment.base, comment.plus1]})
+    end
   end
 end

data/test/test-default-cache.rb

@@ -0,0 +1,43 @@
+# Copyright (C) 2017  Kouhei Sutou <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
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class DefaultCacheTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
+  def setup
+    begin
+      yield
+    ensure
+      Groonga::DefaultCache.base_path = nil
+      Groonga::DefaultCache.reopen
+    end
+  end
+
+  test "set base_path" do
+    base_path = "#{@database_path}.cache"
+    keys_path = "#{base_path}.keys"
+    Groonga::DefaultCache.base_path = base_path
+    assert do
+      not File.exist?(keys_path)
+    end
+
+    Groonga::DefaultCache.reopen
+
+    assert do
+      File.exist?(keys_path)
+    end
+  end
+end

data/test/test-double-array-trie.rb

@@ -123,6 +123,13 @@ class DoubleArrayTrieTest < Test::Unit::TestCase
     assert_true(users.has_key?("morita"))
   end
 
+  def test_key?
+    users = Groonga::DoubleArrayTrie.create(:name => "Users")
+    assert_false(users.key?("morita"))
+    users.add("morita")
+    assert_true(users.key?("morita"))
+  end
+
   def test_prefix_cursor
     paths = Groonga::DoubleArrayTrie.create(:name => "Paths",
                                             :key_type => 'ShortText')

data/test/test-fix-size-column.rb

@@ -128,10 +128,22 @@ class FixSizeColumnTest < Test::Unit::TestCase
       assert_not_predicate(@n_viewed, :vector?)
     end
 
+    def test_weight_vector?
+      assert do
+        not @n_viewed.weight_vector?
+      end
+    end
+
     def test_scalar?
       assert_predicate(@n_viewed, :scalar?)
     end
 
+    def test_data?
+      assert do
+        @n_viewed.data?
+      end
+    end
+
     def test_inspect
       assert_equal("#<Groonga::FixSizeColumn " +
                    "id: <#{@n_viewed.id}>, " +

data/test/test-hash.rb

@@ -280,6 +280,13 @@ class HashTest < Test::Unit::TestCase
                  index.search("engine").collect {|record| record.key.key})
   end
 
+  def test_key?
+    users = Groonga::Hash.create(:name => "Users")
+    assert_false(users.key?("morita"))
+    users.add("morita")
+    assert_true(users.key?("morita"))
+  end
+
   def test_has_key?
     users = Groonga::Hash.create(:name => "Users")
     assert_false(users.has_key?("morita"))

data/test/test-index-column.rb

@@ -48,9 +48,21 @@ class IndexColumnTest < Test::Unit::TestCase
       assert_not_predicate(@index, :vector?)
     end
 
+    def test_weight_vector?
+      assert do
+        not @index.weight_vector?
+      end
+    end
+
     def test_scalar?
       assert_not_predicate(@index, :scalar?)
     end
+
+    def test_data?
+      assert do
+        not @index.data?
+      end
+    end
   end
 
   class CRUDTest < self

data/test/test-index-cursor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2017  Kouhei Sutou <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
@@ -22,20 +22,62 @@ class IndexCursorTest < Test::Unit::TestCase
     setup_records
   end
 
-  def test_open_cursor
-    postings = []
-    @terms.open_cursor do |table_cursor|
-      index_cursor = nil
-      @content_index.open_cursor(table_cursor) do |cursor|
-        cursor.each do |posting|
-          postings << posting.to_hash
+  sub_test_case("#open_cursor") do
+    def test_table_cursor
+      postings = []
+      @terms.open_cursor do |table_cursor|
+        index_cursor = nil
+        @content_index.open_cursor(table_cursor) do |cursor|
+          cursor.each do |posting|
+            postings << posting.to_hash
+          end
+          index_cursor = cursor
+        end
+        assert_predicate(index_cursor, :closed?)
+      end
+
+      assert_equal(expected_postings(:with_position => true),
+                   postings)
+    end
+
+    def test_term_id_without_position
+      postings = []
+      @terms.open_cursor do |table_cursor|
+        table_cursor.each do |term|
+          index_cursor = nil
+          @content_index.open_cursor(term.id,
+                                     :with_position => false) do |cursor|
+            cursor.each do |posting|
+              postings << posting.to_hash
+            end
+            index_cursor = cursor
+          end
+          assert_predicate(index_cursor, :closed?)
         end
-        index_cursor = cursor
       end
-      assert_predicate(index_cursor, :closed?)
+
+      assert_equal(expected_postings(:with_position => false),
+                   postings)
     end
 
-    assert_equal(expected_postings, postings)
+    def test_term_id_with_position
+      postings = []
+      @terms.open_cursor do |table_cursor|
+        table_cursor.each do |term|
+          index_cursor = nil
+          @content_index.open_cursor(term.id) do |cursor|
+            cursor.each do |posting|
+              postings << posting.to_hash
+            end
+            index_cursor = cursor
+          end
+          assert_predicate(index_cursor, :closed?)
+        end
+      end
+
+      assert_equal(expected_postings(:with_position => true),
+                   postings)
+    end
   end
 
   def test_enumerable
@@ -45,7 +87,8 @@ class IndexCursorTest < Test::Unit::TestCase
         postings = cursor.collect do |posting|
           posting.to_hash
         end
-        assert_equal(expected_postings, postings)
+        assert_equal(expected_postings(:with_position => true),
+                     postings)
         opened = true
       end
     end
@@ -58,7 +101,8 @@ class IndexCursorTest < Test::Unit::TestCase
     @terms.open_cursor do |table_cursor|
       @content_index.open_cursor(table_cursor) do |cursor|
         postings = cursor.each.collect(&:to_hash)
-        assert_equal(expected_postings, postings)
+        assert_equal(expected_postings(:with_position => true),
+                     postings)
         opened = true
       end
     end
@@ -78,7 +122,8 @@ class IndexCursorTest < Test::Unit::TestCase
         end
         assert_equal([posting_object_ids.first] * posting_object_ids.size,
                      posting_object_ids)
-        assert_equal(expected_postings, postings)
+        assert_equal(expected_postings(:with_position => true),
+                     postings)
         opened = true
       end
     end
@@ -149,20 +194,40 @@ class IndexCursorTest < Test::Unit::TestCase
     @articles.add("3", :content => "hello")
   end
 
-  def expected_postings
-    parameters = [:record_id, :section_id, :term_id, :position,
-                  :term_frequency, :weight, :n_rest_postings]
-
-    expected = [
-                [1, 1, 1, 0, 1, 0, 0],
-                [2, 1, 1, 1, 1, 0, 0],
-                [2, 1, 2, 0, 1, 0, 0],
-                [3, 1, 2, 2, 1, 0, 0],
-                [3, 1, 3, 0, 1, 0, 0],
-                [3, 1, 4, 1, 1, 0, 0],
-                [3, 1, 5, 3, 1, 0, 0],
-                [3, 1, 6, 4, 1, 0, 0]
-               ]
+  def expected_postings(options={})
+    parameters = [
+      :record_id,
+      :section_id,
+      :term_id,
+      :position,
+      :term_frequency,
+      :weight,
+      :n_rest_postings,
+    ]
+
+    if options[:with_position]
+      expected = [
+        [1, 1, 1, 0, 1, 0, 0],
+        [2, 1, 1, 1, 1, 0, 0],
+        [2, 1, 2, 0, 1, 0, 0],
+        [3, 1, 2, 2, 1, 0, 0],
+        [3, 1, 3, 0, 1, 0, 0],
+        [3, 1, 4, 1, 1, 0, 0],
+        [3, 1, 5, 3, 1, 0, 0],
+        [3, 1, 6, 4, 1, 0, 0]
+      ]
+    else
+      expected = [
+        [1, 1, 1, 0, 1, 0, 1],
+        [2, 1, 1, 0, 1, 0, 1],
+        [2, 1, 2, 0, 1, 0, 1],
+        [3, 1, 2, 0, 1, 0, 1],
+        [3, 1, 3, 0, 1, 0, 0],
+        [3, 1, 4, 1, 1, 0, 0],
+        [3, 1, 5, 3, 1, 0, 0],
+        [3, 1, 6, 4, 1, 0, 0]
+      ]
+    end
 
     create_hashes(parameters, expected)
   end