rroonga 9.0.3 → 11.0.0

data/test/test-plugin.rb

@@ -48,6 +48,7 @@ class PluginTest < Test::Unit::TestCase
     end
 
     def test_by_path
+      only_not_windows # TODO: We can remove this with Groonga 9.0.3
       context.register_plugin("token_filters/stop_word")
       assert_not_nil(context["TokenFilterStopWord"])
       plugin_path = "#{Groonga::Plugin.system_plugins_dir}/"

data/test/test-query-logger.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-2019  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
@@ -29,6 +29,7 @@ class QueryLoggerTest < Test::Unit::TestCase
   end
 
   def test_reopen
+    only_not_windows
     Groonga::QueryLogger.unregister
     Groonga::QueryLogger.path = @query_log_path.to_s
     if @query_log_path.exist?
@@ -109,7 +110,7 @@ class QueryLoggerTest < Test::Unit::TestCase
       Groonga::QueryLogger.log("default")
       Groonga::QueryLogger.log("flags", :flags => "command")
       normalized_infos = infos.collect do |info|
-        info = info.gsub(/\A0x[a-f\d]+\|/,
+        info = info.gsub(/\A[a-zA-Z\d]+\|/,
                          "context_id|")
         info.gsub(/\|[\d]+ \z/,
                   "|timestamp ")
@@ -129,7 +130,7 @@ class QueryLoggerTest < Test::Unit::TestCase
       Groonga::QueryLogger.log("default")
       Groonga::QueryLogger.log("mark", :mark => ":")
       normalized_infos = infos.collect do |info|
-        info.gsub(/\A0x[a-f\d]+\|([^\d])?[\d]+ \z/,
+        info.gsub(/\A[a-zA-Z\d]+\|([^\d])?[\d]+ \z/,
                   "context_id|\\1timestamp ")
       end
       assert_equal([

data/test/test-ractor.rb

@@ -0,0 +1,65 @@
+# Copyright (C) 2021  Sutou Kouhei <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 RactorTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup
+  def need_ractor
+    omit("Ractor is needed") unless defined?(Ractor)
+  end
+
+  setup :setup_database
+
+  setup
+  def setup_tables
+    Groonga::Schema.define do |schema|
+      schema.create_table("Comments") do |table|
+        table.text("content")
+      end
+
+      schema.create_table("Terms",
+                          type: :patricia_trie,
+                          default_tokenizer: "TokenNgram",
+                          normalizer: "NormalizerNFKC130") do |table|
+        table.index("Comments.content", with_position: true)
+      end
+    end
+  end
+
+  setup
+  def setup_records
+    comments = Groonga["Comments"]
+    comments.add(content: "Hello World")
+    comments.add(content: "Groonga is fast!")
+    comments.add(content: "Rroonga is the Groonga bindings")
+  end
+
+  test "select" do
+    ractor = Ractor.new(@database_path) do |database_path|
+      Groonga::Context.open(encoding: nil) do |context|
+        context.open_database(database_path) do
+          comments = context["Comments"]
+          matched_comments = comments.select do |comment|
+            comment.content.match("Groonga")
+          end
+          matched_comments.collect(&:content)
+        end
+      end
+    end
+    assert_equal(["Groonga is fast!", "Rroonga is the Groonga bindings"],
+                 ractor.take)
+  end
+end

data/test/test-record.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2019  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
@@ -647,6 +647,7 @@ class RecordTest < Test::Unit::TestCase
     end
 
     def test_to_json
+      only_not_windows
       ENV["TZ"] = "Japan"
       created_at = Time.parse("2013-05-16T16:57:34+09:00")
       values = {

data/test/test-remote.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2019  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
@@ -20,24 +20,69 @@ class RemoteTest < Test::Unit::TestCase
   def setup_remote_connection
     @process_id = nil
 
-    package_config = PKGConfig.package_config("groonga")
-    groonga = package_config.variable("groonga")
+    vendor_local_bin = File.join(__dir__, "..", "vendor", "local", "bin")
+    if File.exist?(vendor_local_bin)
+      groonga = File.join(vendor_local_bin, "groonga")
+    else
+      package_config = PKGConfig.package_config("groonga")
+      groonga = package_config.variable("groonga")
+      groonga = normalize_groonga_path(groonga)
+      groonga = "groonga" unless File.exist?(groonga)
+    end
 
     @host = "127.0.0.1"
     @port = 12345
     @remote_database_path = @tmp_dir + "remote-database"
-    @process_id = Process.fork do
-      exec(groonga,
-           "-i", @host,
-           "-p", @port.to_s,
-           "-s", "-n", @remote_database_path.to_s)
+    @process_id = spawn(groonga,
+                        "-i", @host,
+                        "-p", @port.to_s,
+                        "-s",
+                        "-n", @remote_database_path.to_s)
+    Timeout.timeout(5) do
+      loop do
+        begin
+          open_client do |client|
+            client.status
+          end
+        rescue Groonga::Client::Error
+        else
+          break
+        end
+      end
+    end
+  end
+
+  def normalize_groonga_path(groonga)
+    return groonga unless groonga
+    return groonga unless Object.const_defined?(:RubyInstaller)
+
+    msys2_installation = RubyInstaller::Runtime.msys2_installation
+    mingw_prefix = msys2_installation.mingw_prefix
+    mingw_bin_path = "#{mingw_prefix}/bin/"
+    mingw_bin_path_windows = "#{msys2_installation.mingw_bin_path}\\"
+    groonga.gsub(/\A#{Regexp.escape(mingw_bin_path)}/) do
+      mingw_bin_path_windows
     end
-    sleep(1)
   end
 
   teardown
   def teardown_remote_connection
-    Process.kill(:TERM, @process_id) if @process_id
+    if @process_id
+      begin
+        open_client do |client|
+          client.shutdown
+        end
+      rescue Groonga::Client::Error
+      end
+      Process.waitpid(@process_id)
+    end
+  end
+
+  def open_client(&block)
+    Groonga::Client.open(host: @host,
+                         port: @port,
+                         protocol: :gqtp,
+                         &block)
   end
 
   def test_send
@@ -47,12 +92,15 @@ class RemoteTest < Test::Unit::TestCase
     id, result = _context.receive
     assert_equal(0, id)
     values = JSON.load(result)
+    values.delete("apache_arrow")
+    values.delete("features")
     assert_equal([
                    "alloc_count",
                    "cache_hit_rate",
                    "command_version",
                    "default_command_version",
                    "max_command_version",
+                   "n_jobs",
                    "n_queries",
                    "start_time",
                    "starttime",

data/test/test-schema-dumper.rb

@@ -395,6 +395,19 @@ column_create Terms Items_title COLUMN_INDEX|WITH_POSITION|INDEX_MEDIUM Items ti
       SCHEMA
     end
 
+    def test_large_index
+      define_index_schema(:title_index_options => {:size => :large})
+      assert_equal(<<-SCHEMA, dump)
+table_create Items TABLE_HASH_KEY ShortText
+column_create Items title COLUMN_SCALAR ShortText
+
+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|INDEX_LARGE Items title
+      SCHEMA
+    end
+
     def test_weight_vector
       define_weight_vector_schema
       assert_equal(<<-SCHEMA, dump)

data/test/test-schema.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2020  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
@@ -920,6 +920,14 @@ class SchemaTest < Test::Unit::TestCase
     end
   end
 
+  def test_normalizer_with_options
+    Groonga::Schema.create_table("Names",
+                                 key_type: :short_text,
+                                 normalizer: "NormalizerNFKC121('unify_kana', true)")
+    assert_equal(Groonga["NormalizerNFKC121"],
+                 Groonga["Names"].normalizer)
+  end
+
   private
   def columns_directory_path(table)
     "#{table.path}.columns"

data/test/test-table-arrow.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2017-2020  Sutou Kouhei <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,6 +22,15 @@ class TableArrowTest < Test::Unit::TestCase
     omit("Apache Arrow support is required") unless context.support_arrow?
   end
 
+  def open_temporary_file(extension)
+    tempfile = Tempfile.new(["table-arrow", extension])
+    begin
+      yield(tempfile)
+    ensure
+      tempfile.close!
+    end
+  end
+
   def assert_dump_load(type, n_records)
     Groonga::Schema.define do |schema|
       schema.create_table("Source") do |table|
@@ -42,9 +51,10 @@ class TableArrowTest < Test::Unit::TestCase
       source.add(:data => data)
     end
 
-    tempfile = Tempfile.new(["table-arrow", ".arrow"])
-    source.dump_arrow(tempfile.path)
-    destination.load_arrow(tempfile.path)
+    open_temporary_file(".arrow") do |tempfile|
+      source.dump_arrow(tempfile.path)
+      destination.load_arrow(tempfile.path)
+    end
 
     assert_equal(expected,
                  destination.collect(&:attributes))
@@ -153,9 +163,10 @@ class TableArrowTest < Test::Unit::TestCase
       source.add(:data1 => data1, :data2 => data2)
     end
 
-    tempfile = Tempfile.new(["table-arrow", ".arrow"])
-    source.dump_arrow(tempfile.path, :columns => source.columns[0, 1])
-    destination.load_arrow(tempfile.path)
+    open_temporary_file(".arrow") do |tempfile|
+      source.dump_arrow(tempfile.path, columns: source.columns[0, 1])
+      destination.load_arrow(tempfile.path)
+    end
 
     assert_equal(expected,
                  destination.collect(&:attributes))
@@ -183,9 +194,10 @@ class TableArrowTest < Test::Unit::TestCase
       source.add(:data1 => data1, :data2 => data2)
     end
 
-    tempfile = Tempfile.new(["table-arrow", ".arrow"])
-    source.dump_arrow(tempfile.path, :column_names => ["data1"])
-    destination.load_arrow(tempfile.path)
+    open_temporary_file(".arrow") do |tempfile|
+      source.dump_arrow(tempfile.path, column_names: ["data1"])
+      destination.load_arrow(tempfile.path)
+    end
 
     assert_equal(expected,
                  destination.collect(&:attributes))

data/test/test-table.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2019  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
@@ -276,6 +276,25 @@ class TableTest < Test::Unit::TestCase
                  bookmark["created_at"].to_a)
   end
 
+  sub_test_case "#support_score?" do
+    setup
+    def setup_table
+      @table = Groonga::Hash.create(:name => "Bookmarks")
+    end
+
+    test "true" do
+       assert do
+         @table.select.support_score?
+      end
+    end
+
+    test "false" do
+      assert do
+        not @table.support_score?
+      end
+    end
+  end
+
   class DeleteTest < self
     setup
     def setup_data
@@ -738,6 +757,7 @@ class TableTest < Test::Unit::TestCase
 
     private
     def by_other_process
+      only_not_windows
       pid = Process.fork do
         yield
       end

data/test/test-variable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2019  Sutou Kouhei <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
@@ -16,13 +16,29 @@
 class VariableTest < Test::Unit::TestCase
   include GroongaTestUtils
 
-  setup :setup_database
+  def setup
+    setup_database
+    @expression = Groonga::Expression.new
+    @variable = @expression.define_variable
+  end
 
   def test_value
-    expression = Groonga::Expression.new
-    variable = expression.define_variable
-    assert_nil(variable.value)
-    variable.value = "morita"
-    assert_equal("morita", variable.value)
+    assert_nil(@variable.value)
+    @variable.value = "morita"
+    assert_equal("morita", @variable.value)
+  end
+
+  sub_test_case("#bulk?") do
+    def test_true
+      assert do
+        @variable.bulk?
+      end
+    end
+
+    def test_false
+      assert do
+        not @expression.bulk?
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 9.0.3
+  version: 11.0.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,38 +12,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pkg-config
+  name: groonga-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: groonga-client
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: native-package-installer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -57,7 +57,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: archive-zip
+  name: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,34 +98,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.5
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -195,8 +167,8 @@ email:
 - dara@shidara.net
 executables:
 - grntest-log-analyze
-- groonga-database-inspect
 - groonga-index-dump
+- groonga-database-inspect
 - grndump
 extensions:
 - ext/groonga/extconf.rb
@@ -364,6 +336,7 @@ files:
 - test/test-plugin.rb
 - test/test-procedure.rb
 - test/test-query-logger.rb
+- test/test-ractor.rb
 - test/test-record.rb
 - test/test-remote.rb
 - test/test-request-canceler.rb
@@ -396,7 +369,8 @@ files:
 homepage: http://ranguba.org/#about-rroonga
 licenses:
 - LGPL-2.1
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: groonga>=11.0.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -413,79 +387,80 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Groonga that provide full text search and column store
   features.
 test_files:
-- test/test-double-array-trie.rb
-- test/test-error-message.rb
-- test/test-token-regexp.rb
-- test/test-encoding.rb
-- test/test-context.rb
-- test/test-schema-dumper.rb
-- test/test-data-column.rb
-- test/test-lock-timeout.rb
-- test/test-convert.rb
-- test/test-memory-pool.rb
-- test/test-index-column.rb
-- test/test-exception.rb
-- test/test-table.rb
-- test/run-test.rb
-- test/test-flushable.rb
+- test/test-table-dumper.rb
+- test/test-query-logger.rb
 - test/test-variable-size-column.rb
-- test/test-table-select-mecab.rb
-- test/test-remote.rb
+- test/test-schema-dumper.rb
+- test/test-double-array-trie.rb
+- test/test-expression-builder.rb
 - test/test-array.rb
-- test/test-table-select-normalize.rb
-- test/test-geo-point.rb
-- test/test-logger.rb
-- test/test-expression.rb
-- test/test-procedure.rb
-- test/test-fix-size-column.rb
 - test/test-id.rb
+- test/test-table-key-support.rb
+- test/test-database-dumper.rb
+- test/test-expression.rb
+- test/test-logger.rb
+- test/run-test.rb
 - test/test-windows-event-logger.rb
-- test/test-schema-type.rb
-- test/test-table-select-weight.rb
-- test/test-accessor.rb
-- test/test-type.rb
-- test/test-hash.rb
-- test/test-patricia-trie.rb
-- test/test-query-logger.rb
-- test/test-record.rb
-- test/test-column.rb
 - test/test-vector-column.rb
-- test/test-variable.rb
+- test/test-operator.rb
+- test/test-table.rb
 - test/test-table-group.rb
-- test/test-table-offset-and-limit.rb
-- test/test-default-cache.rb
-- test/test-normalizer.rb
-- test/test-table-key-support.rb
-- test/test-name.rb
-- test/test-database.rb
-- test/test-version.rb
+- test/test-column.rb
 - test/test-pagination.rb
-- test/test-database-inspector.rb
+- test/test-error-message.rb
+- test/test-fix-size-column.rb
+- test/test-table-arrow.rb
 - test/test-sub-records.rb
+- test/test-table-select-normalize.rb
+- test/test-config.rb
+- test/test-patricia-trie.rb
 - test/test-gqtp.rb
-- test/test-request-canceler.rb
-- test/test-table-traverse.rb
-- test/test-expression-builder.rb
-- test/test-operator.rb
-- test/test-table-dumper.rb
-- test/test-package-label.rb
-- test/test-plugin.rb
-- test/test-database-dumper.rb
-- test/test-snippet.rb
-- test/test-table-arrow.rb
+- test/test-memory-pool.rb
 - test/test-schema-create-table.rb
-- test/groonga-test-utils.rb
-- test/test-thread.rb
 - test/test-schema.rb
-- test/test-request-timer.rb
-- test/test-index-cursor.rb
 - test/test-column-cache.rb
-- test/test-config.rb
 - test/test-command-select.rb
+- test/test-lock-timeout.rb
+- test/test-request-canceler.rb
+- test/test-default-cache.rb
+- test/test-database.rb
+- test/test-token-regexp.rb
+- test/test-table-select-weight.rb
+- test/test-database-inspector.rb
+- test/test-encoding.rb
+- test/test-hash.rb
+- test/test-schema-type.rb
+- test/test-type.rb
+- test/test-context.rb
+- test/test-flushable.rb
+- test/test-normalizer.rb
 - test/test-table-select.rb
+- test/test-index-cursor.rb
+- test/test-remote.rb
+- test/test-snippet.rb
+- test/test-exception.rb
+- test/groonga-test-utils.rb
+- test/test-table-traverse.rb
+- test/test-convert.rb
+- test/test-thread.rb
+- test/test-plugin.rb
+- test/test-accessor.rb
+- test/test-index-column.rb
+- test/test-data-column.rb
+- test/test-ractor.rb
+- test/test-geo-point.rb
+- test/test-request-timer.rb
+- test/test-table-select-mecab.rb
+- test/test-version.rb
+- test/test-package-label.rb
+- test/test-variable.rb
+- test/test-record.rb
+- test/test-table-offset-and-limit.rb
+- test/test-procedure.rb
+- test/test-name.rb