rroonga 4.0.5 → 4.0.6

data/misc/grnop2ruby.rb

@@ -40,7 +40,7 @@ ARGF.each_line do |line|
   case line
   when /\A\s+(GRN_OP_\w+)/
     operator = $1
-    rb_operator = operator.gsub(/\AGRN_OP_/, "").split("_").map{ |word|
+    rb_operator = operator.gsub(/\AGRN_OP_/, "").split("_").map {|word|
       replace_dictionary[word] || word
     }.join("_")
     puts "    rb_define_const(rb_mGrnOperation, \"%s\",

data/rroonga-build.rb

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

data/rroonga.gemspec

@@ -61,6 +61,7 @@ Gem::Specification.new do |s|
 
   s.files = ["README.md", "AUTHORS", "Rakefile", "Gemfile", ".yardopts"]
   s.files += Dir.glob("doc/text/*.textile")
+  s.files += Dir.glob("doc/images/*")
   s.files += ["#{s.name}.gemspec"]
   s.files += ["rroonga-build.rb", "extconf.rb"]
   Dir.chdir(base_dir) do

data/test/groonga-test-utils.rb

@@ -103,8 +103,8 @@ module GroongaTestUtils
   end
 
   def setup_logger
-    Groonga::Logger.register(:level => :dump) do |level, time, title, message, location|
-      p [level, time, title, message, location]
+    Groonga::Logger.register(:max_level => :dump) do |*args|
+      p args
     end
   end
 

data/test/test-column.rb

@@ -461,4 +461,23 @@ class ColumnTest < Test::Unit::TestCase
                    @users_age_column.disk_usage)
     end
   end
+
+  class RenameTest < self
+    def setup
+      setup_database
+
+      Groonga::Schema.define do |schema|
+        schema.create_table("Users") do |table|
+          table.short_text("name")
+        end
+      end
+
+      @users = context["Users"]
+    end
+
+    def test_old_name_reference
+      @users.column("name").rename("nick")
+      assert_nil(@users.column("name"))
+    end
+  end
 end

data/test/test-context.rb

@@ -115,7 +115,11 @@ class ContextTest < Test::Unit::TestCase
   end
 
   def test_support_lzo?
-    assert_boolean(Groonga::Context.default.support_lzo?)
+    assert_false(Groonga::Context.default.support_lzo?)
+  end
+
+  def test_support_lz4?
+    assert_boolean(Groonga::Context.default.support_lz4?)
   end
 
   def test_match_escalation_threshold

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

@@ -55,6 +55,25 @@ class DoubleArrayTrieTest < Test::Unit::TestCase
                  trie.default_tokenizer)
   end
 
+  class TokenFiltersTest < self
+    def test_accessor
+      context.register_plugin("token_filters/stop_word")
+      trie = Groonga::DoubleArrayTrie.create
+      assert_equal([], trie.token_filters)
+      trie.token_filters = ["TokenFilterStopWord"]
+      assert_equal([context["TokenFilterStopWord"]],
+                   trie.token_filters)
+    end
+
+    def test_create
+      context.register_plugin("token_filters/stop_word")
+      token_filters = ["TokenFilterStopWord"]
+      trie = Groonga::DoubleArrayTrie.create(:token_filters => token_filters)
+      assert_equal([context["TokenFilterStopWord"]],
+                   trie.token_filters)
+    end
+  end
+
   def test_search
     users = Groonga::Array.create(:name => "Users")
     users.define_column("name", "ShortText")

data/test/test-exception.rb

@@ -1,4 +1,5 @@
-# Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -83,7 +84,7 @@ class ExceptionTest < Test::Unit::TestCase
     assert_const_defined(Groonga, :OperationNotSupported)
     assert_const_defined(Groonga, :AddressIsInUse)
     assert_const_defined(Groonga, :ZLibError)
-    assert_const_defined(Groonga, :LZOError)
+    assert_const_defined(Groonga, :LZ4Error)
     assert_const_defined(Groonga, :StackOverFlow)
     assert_const_defined(Groonga, :SyntaxError)
     assert_const_defined(Groonga, :RetryMax)
@@ -92,6 +93,10 @@ class ExceptionTest < Test::Unit::TestCase
     assert_const_defined(Groonga, :TooSmallOffset)
     assert_const_defined(Groonga, :TooLargeOffset)
     assert_const_defined(Groonga, :TooSmallLimit)
+    assert_const_defined(Groonga, :CASError)
+    assert_const_defined(Groonga, :UnsupportedCommandVersion)
+    assert_const_defined(Groonga, :NormalizerError)
+    assert_const_defined(Groonga, :TokenFilterError)
   end
 end
 

data/test/test-expression.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -132,6 +133,24 @@ class ExpressionTest < Test::Unit::TestCase
     snippet.close
   end
 
+  def test_keywords
+    users = Groonga::Array.create(:name => "Users")
+    users.define_column("name", "ShortText")
+
+    expression = Groonga::Expression.new
+    variable = expression.define_variable(:domain => users)
+    expression.append_object(variable)
+    expression.parse("ラングバ OR Ruby OR groonga", :default_column => name)
+    expression.compile
+
+    assert_equal([
+                   "Ruby",
+                   "groonga",
+                   "ラングバ",
+                 ],
+                 expression.keywords.sort)
+  end
+
   class AppendObjectTest < self
     setup
     def setup_expression

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  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
@@ -18,50 +18,63 @@ class FixSizeColumnTest < Test::Unit::TestCase
 
   def setup
     setup_database
-
-    setup_bookmarks_table
   end
 
-  def setup_bookmarks_table
-    @bookmarks_path = @tables_dir + "bookmarks"
-    @bookmarks = Groonga::Array.create(:name => "Bookmarks",
-                                       :path => @bookmarks_path.to_s)
+  class OperationTest < self
+    def setup
+      super
+      setup_bookmarks_table
+    end
 
-    @viewed_column_path = @columns_dir + "viewed"
-    @viewed = @bookmarks.define_column("viewed", "Int32",
-                                       :path => @viewed_column_path.to_s)
-  end
+    def setup_bookmarks_table
+      @bookmarks_path = @tables_dir + "bookmarks"
+      @bookmarks = Groonga::Array.create(:name => "Bookmarks",
+                                         :path => @bookmarks_path.to_s)
 
-  def test_index?
-    assert_not_predicate(@viewed, :index?)
-  end
+      @n_viewed_column_path = @columns_dir + "n_viewed"
+      @n_viewed = @bookmarks.define_column("n_viewed", "Int32",
+                                           :path => @n_viewed_column_path.to_s)
+    end
 
-  def test_vector?
-    assert_not_predicate(@viewed, :vector?)
-  end
+    def test_index?
+      assert_not_predicate(@n_viewed, :index?)
+    end
 
-  def test_scalar?
-    assert_predicate(@viewed, :scalar?)
-  end
+    def test_vector?
+      assert_not_predicate(@n_viewed, :vector?)
+    end
 
-  def test_inspect
-    assert_equal("#<Groonga::FixSizeColumn " +
-                 "id: <#{@viewed.id}>, " +
-                 "name: <Bookmarks.viewed>, " +
-                 "path: <#{@viewed_column_path}>, " +
-                 "domain: <Bookmarks>, " +
-                 "range: <Int32>, " +
-                 "flags: <KEY_INT>" +
-                 ">",
-                 @viewed.inspect)
-  end
+    def test_scalar?
+      assert_predicate(@n_viewed, :scalar?)
+    end
 
-  def test_domain
-    assert_equal(@bookmarks, @viewed.domain)
-  end
+    def test_inspect
+      assert_equal("#<Groonga::FixSizeColumn " +
+                   "id: <#{@n_viewed.id}>, " +
+                   "name: <Bookmarks.n_viewed>, " +
+                   "path: <#{@n_viewed_column_path}>, " +
+                   "domain: <Bookmarks>, " +
+                   "range: <Int32>, " +
+                   "flags: <KEY_INT>" +
+                   ">",
+                   @n_viewed.inspect)
+    end
+
+    def test_domain
+      assert_equal(@bookmarks, @n_viewed.domain)
+    end
 
-  def test_table
-    assert_equal(@bookmarks, @viewed.table)
+    def test_table
+      assert_equal(@bookmarks, @n_viewed.table)
+    end
+
+    class AssignTest < self
+      def test_different_types
+        @bookmarks.add(:n_viewed => "100")
+        record = @bookmarks.add(:n_viewed => 101)
+        assert_equal(101, record.n_viewed)
+      end
+    end
   end
 
   class TimeTest < self

data/test/test-hash.rb

@@ -129,6 +129,7 @@ class HashTest < Test::Unit::TestCase
                  "size: <0>, " +
                  "encoding: <#{encoding.inspect}>, " +
                  "default_tokenizer: (nil), " +
+                 "token_filters: [], " +
                  "normalizer: (nil)>",
                  anonymous_table.inspect)
   end
@@ -145,6 +146,7 @@ class HashTest < Test::Unit::TestCase
                  "size: <0>, " +
                  "encoding: <#{encoding.inspect}>, " +
                  "default_tokenizer: (nil), " +
+                 "token_filters: [], " +
                  "normalizer: (nil)>",
                  anonymous_table.inspect)
   end
@@ -162,6 +164,7 @@ class HashTest < Test::Unit::TestCase
                  "size: <0>, " +
                  "encoding: <#{encoding.inspect}>, " +
                  "default_tokenizer: (nil), " +
+                 "token_filters: [], " +
                  "normalizer: (nil)>",
                  named_table.inspect)
   end
@@ -178,6 +181,7 @@ class HashTest < Test::Unit::TestCase
                  "size: <0>, " +
                  "encoding: <#{encoding.inspect}>, " +
                  "default_tokenizer: (nil), " +
+                 "token_filters: [], " +
                  "normalizer: (nil)>",
                  named_table.inspect)
   end
@@ -195,6 +199,24 @@ class HashTest < Test::Unit::TestCase
                  hash.default_tokenizer)
   end
 
+  class TokenFiltersTest < self
+    def test_accessor
+      context.register_plugin("token_filters/stop_word")
+      hash = Groonga::Hash.create
+      assert_equal([], hash.token_filters)
+      hash.token_filters = ["TokenFilterStopWord"]
+      assert_equal([context["TokenFilterStopWord"]],
+                   hash.token_filters)
+    end
+
+    def test_create
+      context.register_plugin("token_filters/stop_word")
+      hash = Groonga::Hash.create(:token_filters => ["TokenFilterStopWord"])
+      assert_equal([context["TokenFilterStopWord"]],
+                   hash.token_filters)
+    end
+  end
+
   def test_normalizer
     hash = Groonga::Hash.create
     assert_nil(hash.normalizer)

data/test/test-patricia-trie.rb

@@ -55,6 +55,25 @@ class PatriciaTrieTest < Test::Unit::TestCase
                  trie.default_tokenizer)
   end
 
+  class TokenFiltersTest < self
+    def test_accessor
+      context.register_plugin("token_filters/stop_word")
+      trie = Groonga::PatriciaTrie.create
+      assert_equal([], trie.token_filters)
+      trie.token_filters = ["TokenFilterStopWord"]
+      assert_equal([context["TokenFilterStopWord"]],
+                   trie.token_filters)
+    end
+
+    def test_create
+      context.register_plugin("token_filters/stop_word")
+      token_filters = ["TokenFilterStopWord"]
+      trie = Groonga::PatriciaTrie.create(:token_filters => token_filters)
+      assert_equal([context["TokenFilterStopWord"]],
+                   trie.token_filters)
+    end
+  end
+
   def test_normalizer
     trie = Groonga::PatriciaTrie.create
     assert_nil(trie.normalizer)
@@ -368,16 +387,16 @@ class PatriciaTrieTest < Test::Unit::TestCase
       points.add(point)
     end
 
-    assert_near_cursor(["129885039x503653023",
-                        "129866001x504328017",
-                        "130015001x504266057",
+    assert_near_cursor(["129786048x504792049",
+                        "129845056x504853081",
+                        "129903045x504648034",
+                        "129917001x504675017",
+                        "129855010x504452003",
+                        "129809022x504597055",
                         "129690039x504418033",
                         "129680021x504441006",
                         "129721099x504685024",
-                        "129855010x504452003",
-                        "129809022x504597055",
-                        "129786048x504792049",
-                        "129845056x504853081"],
+                        "130019020x505027021"],
                        points,
                        "129786048x504792049",
                        {:limit => 10})

data/test/test-schema-dumper.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -86,6 +87,7 @@ class SchemaDumperTest < Test::Unit::TestCase
   end
 
   def define_index_schema
+    context.register_plugin("token_filters/stop_word")
     Groonga::Schema.define do |schema|
       schema.create_table("Items",
                           :type => :hash,
@@ -97,6 +99,7 @@ class SchemaDumperTest < Test::Unit::TestCase
                           :type => :patricia_trie,
                           :key_type => "ShortText",
                           :default_tokenizer => "TokenBigram",
+                          :token_filters => ["TokenFilterStopWord"],
                           :normalizer => "NormalizerAuto") do |table|
         table.index("Items", "_key")
         table.index("Items", "title")
@@ -221,6 +224,7 @@ create_table("Terms",
              :type => :patricia_trie,
              :key_type => "ShortText",
              :default_tokenizer => "TokenBigram",
+             :token_filters => ["TokenFilterStopWord"],
              :normalizer => "NormalizerAuto",
              :force => true) do |table|
 end
@@ -306,7 +310,7 @@ column_create Comments item COLUMN_SCALAR Items
 table_create Items TABLE_HASH_KEY ShortText
 column_create Items title COLUMN_SCALAR ShortText
 
-table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --token_filters TokenFilterStopWord --normalizer NormalizerAuto
 
 column_create Terms Items__key COLUMN_INDEX|WITH_POSITION Items _key
 column_create Terms Items_title COLUMN_INDEX|WITH_POSITION Items title
@@ -329,6 +333,66 @@ column_create Accounts name COLUMN_SCALAR ShortText
       SCHEMA
     end
 
+    class ColumnCompressionTest < self
+      def test_zlib
+        define_column_compression_zlib_schema
+        flags = "COLUMN_SCALAR"
+        flags << "|COMPRESS_ZLIB" if context.support_zlib?
+        assert_equal(<<-SCHEMA, dump)
+table_create Posts TABLE_NO_KEY
+column_create Posts title #{flags} ShortText
+        SCHEMA
+      end
+
+      def test_lz4
+        define_column_compression_lz4_schema
+        flags = "COLUMN_SCALAR"
+        flags << "|COMPRESS_LZ4" if context.support_lz4?
+        assert_equal(<<-SCHEMA, dump)
+table_create Posts TABLE_NO_KEY
+column_create Posts title #{flags} ShortText
+        SCHEMA
+      end
+
+      def test_with_weight_vector
+        define_column_compression_with_weight_vector_schema
+        flags = "COLUMN_VECTOR|WITH_WEIGHT"
+        flags << "|COMPRESS_ZLIB" if context.support_zlib?
+        assert_equal(<<-SCHEMA, dump)
+table_create Posts TABLE_NO_KEY
+column_create Posts comments #{flags} ShortText
+        SCHEMA
+      end
+
+      private
+      def define_column_compression_zlib_schema
+        Groonga::Schema.define do |schema|
+          schema.create_table("Posts") do |table|
+            table.short_text("title", :compress => :zlib)
+          end
+        end
+      end
+
+      def define_column_compression_lz4_schema
+        Groonga::Schema.define do |schema|
+          schema.create_table("Posts") do |table|
+            table.short_text("title", :compress => :lz4)
+          end
+        end
+      end
+
+      def define_column_compression_with_weight_vector_schema
+        Groonga::Schema.define do |schema|
+          schema.create_table("Posts") do |table|
+            table.short_text("comments",
+                             :type => :vector,
+                             :with_weight => true,
+                             :compress => :zlib)
+          end
+        end
+      end
+    end
+
     private
     def dump
       Groonga::Schema.dump(:syntax => :command)