rroonga 5.0.9-x86-mingw32 → 5.1.1-x86-mingw32

data/test/test-database.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2009-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016  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
@@ -237,6 +238,46 @@ class DatabaseTest < Test::Unit::TestCase
                  @database.plugin_paths)
   end
 
+  def test_reindex
+    setup_database
+    Groonga::Schema.define do |schema|
+      schema.create_table("Memos",
+                          :type => :array) do |table|
+        table.column("content", "Text")
+      end
+      schema.create_table("Terms",
+                          :type => :patricia_trie,
+                          :key_type => "ShortText",
+                          :default_tokenizer => "TokenBigram",
+                          :normalizer => "NormalizerAuto") do |table|
+        table.index("Memos.content")
+      end
+    end
+
+    memos = context["Memos"]
+    memos.add(:content => "This is a memo")
+
+    terms = context["Terms"]
+    terms.delete("this")
+
+    assert_equal([
+                   "a",
+                   "is",
+                   "memo",
+                 ],
+                 terms.collect(&:_key).sort)
+
+    @database.reindex
+
+    assert_equal([
+                   "a",
+                   "is",
+                   "memo",
+                   "this",
+                 ],
+                 terms.collect(&:_key).sort)
+  end
+
   class RemoveTest < self
     setup :setup_database
 

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

@@ -1,4 +1,5 @@
 # Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016  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
@@ -20,6 +21,89 @@ class FixSizeColumnTest < Test::Unit::TestCase
     setup_database
   end
 
+  def test_reindex
+    Groonga::Schema.define do |schema|
+      schema.create_table("Users", :type => :hash) do |table|
+        table.integer32("age")
+        table.integer32("score")
+      end
+
+      schema.create_table("Numbers",
+                          :type => :patricia_trie,
+                          :key_type => :integer32) do |table|
+        table.index("Users.age")
+        table.index("Users.score")
+      end
+
+      schema.create_table("Ages",
+                          :type => :patricia_trie,
+                          :key_type => :integer32) do |table|
+        table.index("Users.age")
+      end
+
+      schema.create_table("Scores",
+                          :type => :patricia_trie,
+                          :key_type => :integer32) do |table|
+        table.index("Users.score")
+      end
+    end
+
+    users = context["Users"]
+    users.add("Alice", :age => 16, :score => 123)
+    users.add("Bob", :age => 29, :score => -10)
+
+    numbers = context["Numbers"]
+    numbers.delete(16)
+    numbers.delete(123)
+
+    ages = context["Ages"]
+    ages.delete(29)
+
+    scores = context["Scores"]
+    scores.delete(-10)
+
+    assert_equal({
+                   :numbers => [
+                     -10,
+                     29,
+                   ],
+                   :ages => [
+                     16,
+                   ],
+                   :scores => [
+                     123,
+                   ],
+                 },
+                 {
+                   :numbers => numbers.collect(&:_key).sort,
+                   :ages => ages.collect(&:_key).sort,
+                   :scores => scores.collect(&:_key).sort,
+                 })
+
+    context["Users.age"].reindex
+
+    assert_equal({
+                   :numbers => [
+                     -10,
+                     16,
+                     29,
+                   ],
+                   :ages => [
+                     16,
+                     29,
+                   ],
+                   :scores => [
+                     123,
+                   ],
+                 },
+                 {
+                   :numbers => numbers.collect(&:_key).sort,
+                   :ages => ages.collect(&:_key).sort,
+                   :scores => scores.collect(&:_key).sort,
+                 })
+
+  end
+
   class OperationTest < self
     def setup
       super

data/test/test-index-column.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016  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
@@ -175,6 +176,75 @@ class IndexColumnTest < Test::Unit::TestCase
     end
   end
 
+  def test_reindex
+    Groonga::Schema.define do |schema|
+      schema.create_table("Memos", :type => :array) do |table|
+        table.short_text("title")
+        table.text("content")
+      end
+
+      schema.create_table("BigramTerms",
+                          :type => :patricia_trie,
+                          :key_type => :short_text,
+                          :normalizer => "NormalizerAuto",
+                          :default_tokenizer => "TokenBigram") do |table|
+        table.index("Memos.title")
+        table.index("Memos.content")
+      end
+
+      schema.create_table("MeCabTerms",
+                          :type => :patricia_trie,
+                          :key_type => :short_text,
+                          :normalizer => "NormalizerAuto",
+                          :default_tokenizer => "TokenMecab") do |table|
+        table.index("Memos.title")
+        table.index("Memos.content")
+      end
+    end
+
+    memos = context["Memos"]
+    memos.add(:title => "memo1", :content => "もり")
+
+    bigram_terms = context["BigramTerms"]
+    bigram_terms.delete("memo")
+    bigram_terms.delete("り")
+
+    mecab_terms = context["MeCabTerms"]
+    mecab_terms.delete("1")
+    mecab_terms.delete("もり")
+
+    assert_equal({
+                   :bigram => [
+                     "1",
+                     "もり",
+                   ],
+                   :mecab => [
+                     "memo",
+                   ],
+                 },
+                 {
+                   :bigram => bigram_terms.collect(&:_key).sort,
+                   :mecab => mecab_terms.collect(&:_key).sort,
+                 })
+
+    context["MeCabTerms.Memos_content"].reindex
+
+    assert_equal({
+                   :bigram => [
+                     "1",
+                     "もり",
+                   ],
+                   :mecab => [
+                     "memo",
+                     "もり",
+                   ],
+                 },
+                 {
+                   :bigram => bigram_terms.collect(&:_key).sort,
+                   :mecab => mecab_terms.collect(&:_key).sort,
+                 })
+  end
+
   class NGramTest < self
     setup
     def setup_schema
@@ -575,7 +645,7 @@ class IndexColumnTest < Test::Unit::TestCase
       end
 
       def test_query
-        assert_equal(6, @index.estimate_size("roonga"))
+        assert_equal(3, @index.estimate_size("roonga"))
       end
     end
 

data/test/test-package-label.rb

@@ -0,0 +1,20 @@
+# Copyright (C) 2016  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
+# 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 PackageLabelTest < Test::Unit::TestCase
+  def test_reader
+    assert_equal("Groonga", Groonga.package_label)
+  end
+end

data/test/test-table-key-support.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2013-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016  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
@@ -195,4 +196,45 @@ class TableKeySupportTest < Test::Unit::TestCase
       end
     end
   end
+
+  class ReindexTest < self
+    def test_patricia_trie
+      Groonga::Schema.define do |schema|
+        schema.create_table("Memos",
+                            :type => :array) do |table|
+          table.text("content")
+        end
+        schema.create_table("Terms",
+                            :type => :patricia_trie,
+                            :key_type => :short_text,
+                            :default_tokenizer => "TokenBigram",
+                            :normalizer => "NormalizerAuto") do |table|
+          table.index("Memos.content")
+        end
+      end
+
+      memos = context["Memos"]
+      memos.add(:content => "This is a memo")
+
+      terms = context["Terms"]
+      terms.delete("this")
+
+      assert_equal([
+                     "a",
+                     "is",
+                     "memo",
+                   ],
+                   terms.collect(&:_key).sort)
+
+      terms.reindex
+
+      assert_equal([
+                     "a",
+                     "is",
+                     "memo",
+                     "this",
+                   ],
+                   terms.collect(&:_key).sort)
+    end
+  end
 end

data/test/test-table.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016  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
@@ -455,6 +456,18 @@ class TableTest < Test::Unit::TestCase
                    ],
                    results.collect(&:location))
     end
+
+    test "accessor" do
+      searched_posts = @posts.select("true", :syntax => :script)
+      results = searched_posts.geo_sort(searched_posts.column("location"),
+                                        "35.7119x139.7983")
+      assert_equal([
+                     Groonga::WGS84GeoPoint.new("35.730061x139.796234"),
+                     Groonga::WGS84GeoPoint.new("35.685341x139.783981"),
+                     Groonga::WGS84GeoPoint.new("35.720253x139.762573"),
+                   ],
+                   results.collect(&:location))
+    end
   end
 
   def test_union!

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

@@ -1,5 +1,5 @@
 # Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
-# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
+# Copyright (C) 2014-2016  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
@@ -124,6 +124,76 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     assert_equal(1, @name.defrag)
   end
 
+  def test_reindex
+    Groonga::Schema.define do |schema|
+      schema.create_table("Memos", :type => :array) do |table|
+        table.short_text("title")
+        table.text("content")
+      end
+
+      schema.create_table("BigramTerms",
+                          :type => :patricia_trie,
+                          :key_type => :short_text,
+                          :normalizer => "NormalizerAuto",
+                          :default_tokenizer => "TokenBigram") do |table|
+        table.index("Memos.title")
+        table.index("Memos.content")
+      end
+
+      schema.create_table("MeCabTerms",
+                          :type => :patricia_trie,
+                          :key_type => :short_text,
+                          :normalizer => "NormalizerAuto",
+                          :default_tokenizer => "TokenMecab") do |table|
+        table.index("Memos.title")
+        table.index("Memos.content")
+      end
+    end
+
+    memos = context["Memos"]
+    memos.add(:title => "memo1", :content => "もり")
+
+    bigram_terms = context["BigramTerms"]
+    bigram_terms.delete("memo")
+    bigram_terms.delete("り")
+
+    mecab_terms = context["MeCabTerms"]
+    mecab_terms.delete("1")
+    mecab_terms.delete("もり")
+
+    assert_equal({
+                   :bigram => [
+                     "1",
+                     "もり",
+                   ],
+                   :mecab => [
+                     "memo",
+                   ],
+                 },
+                 {
+                   :bigram => bigram_terms.collect(&:_key).sort,
+                   :mecab => mecab_terms.collect(&:_key).sort,
+                 })
+
+    context["Memos.content"].reindex
+
+    assert_equal({
+                   :bigram => [
+                     "1",
+                     "もり",
+                     "り",
+                   ],
+                   :mecab => [
+                     "memo",
+                     "もり",
+                   ],
+                 },
+                 {
+                   :bigram => bigram_terms.collect(&:_key).sort,
+                   :mecab => mecab_terms.collect(&:_key).sort,
+                 })
+  end
+
   class VectorTest < self
     class ReferenceTest < self
       def test_append