rroonga 10.0.6 → 11.0.0

data/ext/groonga/rb-groonga.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2020  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2009-2021  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -205,6 +205,10 @@ rb_grn_init_package_label (VALUE mGrn)
 void
 Init_groonga (void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
     VALUE mGrn;
 
     mGrn = rb_define_module("Groonga");

data/lib/groonga/context.rb

@@ -20,6 +20,38 @@ require "groonga/context/command-executor"
 
 module Groonga
   class Context
+    class << self
+      # Opens a new context. If block is given, the opened context is
+      # closed automatically after the given block is evaluated.
+      #
+      # @overload open(*args, &block)
+      #   @param args [::Array<Object>] Passed through to
+      #     {Groonga::Context#initialize}.
+      #   @yieldparam context [Groonga::Context] The newly created context.
+      #   @return [Object] The return value of the given block is the
+      #     return value of the call.
+      #
+      # @overload open(*args)
+      #   @param args [::Array<Object>] Passed through to
+      #     {Groonga::Context#initialize}.
+      #   @yieldparam context [Groonga::Context] The newly created context.
+      #   @return [Groonga::Context] The newly created context.
+      #
+      # @see Groonga::Context#initialize
+      def open(*args, **kwargs)
+        context = new(*args, **kwargs)
+        if block_given?
+          begin
+            yield(context)
+          ensure
+            context.close
+          end
+        else
+          context
+        end
+      end
+    end
+
     # _path_ にある既存のデータベースを開く。ブロックを指定した場
     # 合はブロックに開いたデータベースを渡し、ブロックを抜けると
     # きに閉じる。

data/rroonga-build.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2021  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
@@ -16,11 +16,12 @@
 
 module RroongaBuild
   module RequiredGroongaVersion
-    MAJOR = 9
+    MAJOR = 11
     MINOR = 0
-    MICRO = 2
+    MICRO = 0
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2019, 4, 29)
+    STRING = VERSION.join(".")
+    RELEASED_DATE = Time.utc(2021, 2, 9)
   end
 
   module_function

data/rroonga.gemspec

@@ -17,6 +17,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "English"
+require_relative "rroonga-build"
 
 base_dir = File.dirname(__FILE__)
 ext_dir = File.join(base_dir, "ext", "groonga")
@@ -82,9 +83,10 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.3"
 
-  s.add_runtime_dependency("pkg-config")
   s.add_runtime_dependency("groonga-client", ">= 0.0.3")
   s.add_runtime_dependency("json")
+  s.add_runtime_dependency("native-package-installer")
+  s.add_runtime_dependency("pkg-config")
   s.add_development_dependency("test-unit", [">= 3.0.0"])
   s.add_development_dependency("rake")
   s.add_development_dependency("bundler")
@@ -92,6 +94,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("packnga", [">= 1.0.0"])
   s.add_development_dependency("kramdown")
 
-  s.metadata["msys2_mingw_dependencies"] = "groonga>=10.0.1"
+  required_groonga_version = RroongaBuild::RequiredGroongaVersion::STRING
+  s.metadata["msys2_mingw_dependencies"] = "groonga>=#{required_groonga_version}"
 end
 

data/test/groonga-test-utils.rb

@@ -140,6 +140,9 @@ module GroongaTestUtils
   end
 
   def teardown_log_path
+    Groonga::Logger.path = nil
+    Groonga::QueryLogger.path = nil
+
     return unless @dump_log
     if @log_path.exist?(log_path)
       header = "--- log: #{@log_path} ---"

data/test/test-index-column.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2021  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -203,6 +201,8 @@ class IndexColumnTest < Test::Unit::TestCase
   end
 
   def test_reindex
+    check_mecab_availability
+
     Groonga::Schema.define do |schema|
       schema.create_table("Memos", :type => :array) do |table|
         table.short_text("title")

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-remote.rb

@@ -92,6 +92,8 @@ 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",

data/test/test-table-arrow.rb

@@ -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))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 10.0.6
+  version: 11.0.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,13 +9,27 @@ authors:
 - daijiro
 - Yuto HAYAMIZU
 - SHIDARA Yoji
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 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.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -29,21 +43,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: groonga-client
+  name: native-package-installer
   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: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -153,9 +167,9 @@ email:
 - dara@shidara.net
 executables:
 - grntest-log-analyze
+- groonga-index-dump
 - groonga-database-inspect
 - grndump
-- groonga-index-dump
 extensions:
 - ext/groonga/extconf.rb
 extra_rdoc_files:
@@ -322,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
@@ -355,8 +370,8 @@ homepage: http://ranguba.org/#about-rroonga
 licenses:
 - LGPL-2.1
 metadata:
-  msys2_mingw_dependencies: groonga>=10.0.1
-post_install_message:
+  msys2_mingw_dependencies: groonga>=11.0.0
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -372,79 +387,80 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+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-remote.rb
-- test/test-table-arrow.rb
-- test/test-encoding.rb
-- test/test-column-cache.rb
-- test/test-table-traverse.rb
+- test/test-table-dumper.rb
+- test/test-query-logger.rb
+- test/test-variable-size-column.rb
+- test/test-schema-dumper.rb
+- test/test-double-array-trie.rb
+- test/test-expression-builder.rb
+- test/test-array.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/test-exception.rb
-- test/test-vector-column.rb
 - test/run-test.rb
-- test/test-memory-pool.rb
-- test/test-context.rb
-- test/test-default-cache.rb
 - test/test-windows-event-logger.rb
-- test/test-schema-create-table.rb
+- test/test-vector-column.rb
+- test/test-operator.rb
+- test/test-table.rb
 - test/test-table-group.rb
+- test/test-column.rb
+- test/test-pagination.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-memory-pool.rb
+- test/test-schema-create-table.rb
+- test/test-schema.rb
+- test/test-column-cache.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-command-select.rb
-- test/test-table-offset-and-limit.rb
 - test/test-schema-type.rb
-- test/test-sub-records.rb
-- test/test-data-column.rb
+- test/test-type.rb
+- test/test-context.rb
 - test/test-flushable.rb
-- test/test-double-array-trie.rb
-- test/groonga-test-utils.rb
-- test/test-name.rb
-- test/test-lock-timeout.rb
-- test/test-database-inspector.rb
-- test/test-expression.rb
-- test/test-table-dumper.rb
-- test/test-plugin.rb
-- test/test-procedure.rb
-- test/test-error-message.rb
-- test/test-table-select-mecab.rb
-- test/test-expression-builder.rb
-- test/test-operator.rb
-- test/test-query-logger.rb
-- test/test-table-select-normalize.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-variable-size-column.rb
-- test/test-variable.rb
-- test/test-id.rb
-- test/test-patricia-trie.rb
-- test/test-request-timer.rb
-- test/test-pagination.rb
-- test/test-request-canceler.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-version.rb
-- test/test-column.rb
-- test/test-database-dumper.rb
+- test/test-plugin.rb
 - test/test-accessor.rb
-- test/test-index-cursor.rb
-- test/test-table.rb
-- test/test-normalizer.rb
-- test/test-table-select-weight.rb
-- test/test-fix-size-column.rb
-- test/test-convert.rb
-- test/test-record.rb
-- test/test-package-label.rb
-- test/test-array.rb
-- test/test-schema.rb
-- test/test-config.rb
 - test/test-index-column.rb
-- test/test-table-key-support.rb
-- test/test-schema-dumper.rb
-- test/test-gqtp.rb
-- test/test-token-regexp.rb
-- test/test-type.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