rroonga 6.1.3 → 7.0.2

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/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

data/test/test-patricia-trie.rb

@@ -124,6 +124,13 @@ class PatriciaTrieTest < Test::Unit::TestCase
     end
   end
 
+  def test_key?
+    users = Groonga::PatriciaTrie.create(:name => "Users")
+    assert_false(users.key?("morita"))
+    users.add("morita")
+    assert_true(users.key?("morita"))
+  end
+
   def test_has_key?
     users = Groonga::PatriciaTrie.create(:name => "Users")
     assert_false(users.has_key?("morita"))

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

@@ -46,6 +46,13 @@ class VariableSizeColumnTest < Test::Unit::TestCase
       @users.define_column("nick_names", "ShortText",
                            :type => :vector,
                            :path => @users_nick_names_column_path.to_s)
+
+    @users_tags_column_path = @columns_dir + "tags"
+    @tags =
+      @users.define_column("tags", "ShortText",
+                           :type => :vector,
+                           :with_weight => true,
+                           :path => @users_tags_column_path.to_s)
   end
 
   def setup_users
@@ -62,10 +69,22 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     assert_predicate(@nick_names, :vector?)
   end
 
+  def test_weigth_vector?
+    assert do
+      @tags.weight_vector?
+    end
+  end
+
   def test_scalar?
     assert_not_predicate(@nick_names, :scalar?)
   end
 
+  def test_data?
+    assert do
+      @nick_names.data?
+    end
+  end
+
   def test_compressed?
     description = @users.define_column("description", "ShortText",
                                        :compress => :zlib)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 7.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -194,10 +194,10 @@ email:
 - y.hayamizu@gmail.com
 - dara@shidara.net
 executables:
-- groonga-database-inspect
+- groonga-index-dump
 - grndump
+- groonga-database-inspect
 - grntest-log-analyze
-- groonga-index-dump
 extensions:
 - ext/groonga/extconf.rb
 extra_rdoc_files:
@@ -239,6 +239,7 @@ files:
 - ext/groonga/rb-grn-context.c
 - ext/groonga/rb-grn-data-column.c
 - ext/groonga/rb-grn-database.c
+- ext/groonga/rb-grn-default-cache.c
 - ext/groonga/rb-grn-double-array-trie-cursor.c
 - ext/groonga/rb-grn-double-array-trie.c
 - ext/groonga/rb-grn-encoding-support.c
@@ -258,6 +259,7 @@ files:
 - ext/groonga/rb-grn-index-column.c
 - ext/groonga/rb-grn-index-cursor.c
 - ext/groonga/rb-grn-index.c
+- ext/groonga/rb-grn-inverted-index-cursor.c
 - ext/groonga/rb-grn-less-equal-operator.c
 - ext/groonga/rb-grn-less-operator.c
 - ext/groonga/rb-grn-logger.c
@@ -335,6 +337,7 @@ files:
 - 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
@@ -411,77 +414,78 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Groonga that provide full text search and column store
   features.
 test_files:
-- test/run-test.rb
-- test/test-error-message.rb
-- test/test-request-canceler.rb
-- test/test-normalizer.rb
-- test/test-database.rb
-- test/test-schema-type.rb
-- test/test-convert.rb
-- test/test-memory-pool.rb
-- test/test-gqtp.rb
-- test/test-id.rb
-- test/test-schema-create-table.rb
-- test/test-query-logger.rb
-- test/test-pagination.rb
-- test/test-expression-builder.rb
-- test/test-table-group.rb
 - test/test-schema.rb
-- test/test-operator.rb
-- test/test-expression.rb
-- test/test-name.rb
-- test/test-patricia-trie.rb
-- test/test-command-select.rb
-- test/test-context.rb
-- test/test-variable-size-column.rb
-- test/test-request-timer.rb
+- test/test-snippet.rb
+- test/test-request-canceler.rb
 - test/test-variable.rb
-- test/test-sub-records.rb
-- test/test-index-cursor.rb
+- test/test-geo-point.rb
+- test/test-plugin.rb
+- test/test-table-group.rb
+- test/test-accessor.rb
 - test/test-double-array-trie.rb
-- test/test-table-select.rb
-- test/test-windows-event-logger.rb
+- test/test-pagination.rb
+- test/test-memory-pool.rb
+- test/test-request-timer.rb
+- test/test-column.rb
 - test/test-table-traverse.rb
-- test/test-exception.rb
+- test/test-expression.rb
+- test/test-table-select.rb
+- test/test-encoding.rb
+- test/test-logger.rb
+- test/test-schema-create-table.rb
+- test/test-hash.rb
+- test/test-type.rb
+- test/test-table-offset-and-limit.rb
+- test/test-version.rb
+- test/test-data-column.rb
+- test/test-lock-timeout.rb
 - test/test-index-column.rb
-- test/test-geo-point.rb
+- test/test-table-key-support.rb
 - test/test-vector-column.rb
-- test/test-lock-timeout.rb
-- test/test-array.rb
-- test/test-schema-dumper.rb
-- test/test-fix-size-column.rb
-- test/test-table-select-mecab.rb
+- test/test-error-message.rb
+- test/test-normalizer.rb
+- test/test-table-select-weight.rb
+- test/test-schema-type.rb
+- test/test-sub-records.rb
 - test/test-procedure.rb
+- test/test-config.rb
+- test/test-context.rb
+- test/test-gqtp.rb
+- test/test-remote.rb
 - test/test-database-dumper.rb
+- test/test-name.rb
 - test/test-database-inspector.rb
-- test/test-package-label.rb
-- test/test-data-column.rb
-- test/test-table-key-support.rb
-- test/test-table-offset-and-limit.rb
-- test/test-accessor.rb
-- test/test-remote.rb
-- test/test-plugin.rb
+- test/test-id.rb
+- test/test-patricia-trie.rb
+- test/run-test.rb
+- test/test-fix-size-column.rb
+- test/test-statistic-measurer.rb
+- test/test-array.rb
+- test/test-table.rb
 - test/groonga-test-utils.rb
-- test/test-column.rb
 - test/test-record.rb
-- test/test-hash.rb
-- test/test-logger.rb
-- test/test-table-select-weight.rb
-- test/test-version.rb
+- test/test-exception.rb
 - test/test-table-select-normalize.rb
-- test/test-config.rb
-- test/test-flushable.rb
-- test/test-encoding.rb
 - test/test-thread.rb
-- test/test-snippet.rb
-- test/test-type.rb
-- test/test-table.rb
-- test/test-table-dumper.rb
-- test/test-statistic-measurer.rb
+- test/test-schema-dumper.rb
 - test/test-token-regexp.rb
+- test/test-table-dumper.rb
+- test/test-database.rb
+- test/test-query-logger.rb
+- test/test-package-label.rb
+- test/test-variable-size-column.rb
+- test/test-default-cache.rb
+- test/test-table-select-mecab.rb
+- test/test-windows-event-logger.rb
+- test/test-expression-builder.rb
+- test/test-operator.rb
+- test/test-flushable.rb
+- test/test-convert.rb
+- test/test-index-cursor.rb
+- test/test-command-select.rb