rroonga 9.0.2 → 10.0.6

data/ext/groonga/rb-grn-type.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-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
@@ -304,6 +304,10 @@ rb_grn_init_type (VALUE mGrn)
     rb_define_const(rb_cGrnType, "INT64", INT2NUM(GRN_DB_INT64));
     /* 64bit符号なし整数。 */
     rb_define_const(rb_cGrnType, "UINT64", INT2NUM(GRN_DB_UINT64));
+#if RB_GRN_HAVE_FLOAT32
+    /* 32bit floating pointer number in IEEE754 format. */
+    rb_define_const(rb_cGrnType, "FLOAT32", INT2NUM(GRN_DB_FLOAT32));
+#endif
     /* ieee754形式の64bit浮動小数点数。 */
     rb_define_const(rb_cGrnType, "FLOAT", INT2NUM(GRN_DB_FLOAT));
     /* 1970年1月1日0時0分0秒からの経過マイクロ秒数を64bit符

data/ext/groonga/rb-grn-utils.c

@@ -1,7 +1,7 @@
 /* -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* vim: set sts=4 sw=4 ts=8 noet: */
 /*
-  Copyright (C) 2009-2017  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-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
@@ -201,6 +201,11 @@ rb_grn_bulk_to_ruby_object_by_range_id (grn_ctx *context, grn_obj *bulk,
     case GRN_DB_UINT64:
         *rb_value = ULL2NUM(GRN_UINT64_VALUE(bulk));
         break;
+#if RB_GRN_HAVE_FLOAT32
+    case GRN_DB_FLOAT32:
+        *rb_value = rb_float_new(GRN_FLOAT32_VALUE(bulk));
+        break;
+#endif
     case GRN_DB_FLOAT:
         *rb_value = rb_float_new(GRN_FLOAT_VALUE(bulk));
         break;
@@ -447,6 +452,7 @@ rb_grn_bulk_from_ruby_object_with_type (VALUE object, grn_ctx *context,
         int64_t int64_value;
         uint64_t uint64_value;
         int64_t time_value;
+        float float_value;
         double double_value;
         grn_geo_point geo_point_value;
         grn_id record_id;
@@ -525,6 +531,16 @@ rb_grn_bulk_from_ruby_object_with_type (VALUE object, grn_ctx *context,
         string = (const char *)&(value.uint64_value);
         size = sizeof(value.uint64_value);
         break;
+#if RB_GRN_HAVE_FLOAT32
+    case GRN_DB_FLOAT32:
+        if (string_p) {
+            object = rb_Float(object);
+        }
+        value.float_value = NUM2DBL(object);
+        string = (const char *)&(value.float_value);
+        size = sizeof(value.float_value);
+        break;
+#endif
     case GRN_DB_FLOAT:
         if (string_p) {
             object = rb_Float(object);

data/ext/groonga/rb-grn.h

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2018  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2020  Sutou Kouhei <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
@@ -73,17 +73,9 @@ RB_GRN_BEGIN_DECLS
 #  define RB_GRN_GNUC_NULL_TERMINATED
 #endif
 
-#if defined(RUBY_GRN_PLATFORM_WIN32) && !defined(RB_GRN_PLATFORM_WIN32)
-#  define RB_GRN_PLATFORM_WIN32 RUBY_GRN_PLATFORM_WIN32
-#endif
-
-#if defined(RUBY_GRN_STATIC_COMPILATION) && !defined(RB_GRN_STATIC_COMPILATION)
-#  define RB_GRN_STATIC_COMPILATION RUBY_GRN_STATIC_COMPILATION
-#endif
-
-#if defined(RB_GRN_PLATFORM_WIN32) && !defined(RB_GRN_STATIC_COMPILATION)
+#ifdef __WIN32__
 #  ifdef RB_GRN_COMPILATION
-#    define RB_GRN_VAR __declspec(dllexport)
+#    define RB_GRN_VAR extern __declspec(dllexport)
 #  else
 #    define RB_GRN_VAR extern __declspec(dllimport)
 #  endif
@@ -97,9 +89,11 @@ RB_GRN_BEGIN_DECLS
 #  define debug(...)
 #endif
 
-#define RB_GRN_MAJOR_VERSION 9
+#define RB_GRN_HAVE_FLOAT32 GRN_VERSION_OR_LATER(10, 0, 2)
+
+#define RB_GRN_MAJOR_VERSION 10
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 2
+#define RB_GRN_MICRO_VERSION 6
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

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-2018  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2020  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
@@ -22,7 +22,7 @@
 grn_bool rb_grn_exited = GRN_FALSE;
 
 static VALUE
-finish_groonga (VALUE data)
+finish_groonga (RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg))
 {
     debug("finish\n");
     grn_fin();

data/lib/groonga.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-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
@@ -44,12 +44,8 @@ require "groonga/record"
 require "groonga/expression-builder"
 require "groonga/posting"
 require "groonga/index"
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/groonga.so"
-rescue LoadError
-  require "groonga.so"
-end
+
+require "groonga.so"
 
 ##
 # rroonga用のネームスペース。rroongaのクラスやメソッ

data/lib/groonga/dumper.rb

@@ -491,6 +491,8 @@ module Groonga
           options[:size] = :small
         elsif column.medium?
           options[:size] = :medium
+        elsif column.large?
+          options[:size] = :large
         end
         arguments = [
           dump_object(target_table_name),
@@ -652,6 +654,7 @@ module Groonga
         flags << "WITH_POSITION" if column.with_position?
         flags << "INDEX_SMALL" if column.small?
         flags << "INDEX_MEDIUM" if column.medium?
+        flags << "INDEX_LARGE" if column.large?
         parameters << "#{flags.join('|')}"
         parameters << "#{column.range.name}"
         source_names = column.sources.collect do |source|

data/lib/groonga/record.rb

@@ -205,10 +205,10 @@ module Groonga
       self["_score"] = new_score
     end
 
-    # {Groonga::Record#score} が利用できる場合は +true+ を
+    # {Groonga::Record#score} が利用できる場合は `true` を
     # 返す。
     def support_score?
-      @table.have_column?("_score") # TODO delegate to Table
+      @table.support_score?
     end
 
     # 主キーの値が同一であったレコードの件数を返す。検索結果とし

data/rroonga.gemspec

@@ -1,6 +1,6 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- ruby -*-
 #
-# Copyright (C) 2012-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -85,14 +85,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("pkg-config")
   s.add_runtime_dependency("groonga-client", ">= 0.0.3")
   s.add_runtime_dependency("json")
-  s.add_runtime_dependency("archive-zip")
   s.add_development_dependency("test-unit", [">= 3.0.0"])
   s.add_development_dependency("rake")
-  s.add_development_dependency("rake-compiler", [">= 0.9.5"])
-  s.add_development_dependency("rake-compiler-dock", [">= 0.6.2"])
   s.add_development_dependency("bundler")
   s.add_development_dependency("yard")
   s.add_development_dependency("packnga", [">= 1.0.0"])
   s.add_development_dependency("kramdown")
+
+  s.metadata["msys2_mingw_dependencies"] = "groonga>=10.0.1"
 end
 

data/test/groonga-test-utils.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2015  Masafumi Yokoyama <yokoyama@clear-code.com>
-# Copyright (C) 2009-2015  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
@@ -14,13 +14,16 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+require "erb"
 require "fileutils"
+require "json"
 require "pathname"
+require "stringio"
 require "tempfile"
 require "time"
-require "erb"
-require "stringio"
-require "json"
+require "timeout"
+
+require "groonga/client"
 require "pkg-config"
 
 require "groonga"
@@ -44,7 +47,7 @@ module GroongaTestUtils
     setup_context
 
     @database = nil
-    name_for_path = name.gsub(/[\(\)\[\] ]/, "-")
+    name_for_path = escape_path(name)
     @database_path = @tmp_dir + "#{name_for_path}.db"
   end
 
@@ -69,9 +72,11 @@ module GroongaTestUtils
 
     @log_path = @tmp_dir + "groonga.log"
     Groonga::Logger.path = @log_path.to_s
+    Groonga::Logger.reopen
 
     @query_log_path = @tmp_dir + "groonga-query.log"
     Groonga::QueryLogger.path = @query_log_path.to_s
+    Groonga::QueryLogger.reopen
   end
 
   def setup_tables_directory
@@ -107,6 +112,14 @@ module GroongaTestUtils
     end
   end
 
+  def collect_query_log
+    @query_log_path.open do |file|
+      file.seek(0, IO::SEEK_END)
+      yield
+      file.read
+    end
+  end
+
   def setup_database
     @database = Groonga::Database.create(:path => @database_path.to_s)
   end
@@ -155,6 +168,12 @@ module GroongaTestUtils
                  actual.expression.inspect)
   end
 
+  def escape_path(path)
+    path.gsub(/[: ?!\(\)\[\]]/) do
+      "_"
+    end
+  end
+
   def linux?
     /linux/ =~ RUBY_PLATFORM
   end
@@ -167,6 +186,10 @@ module GroongaTestUtils
     /cygwin|mingw|mswin/ === RUBY_PLATFORM
   end
 
+  def only_not_windows
+    omit("This test is only for non Windows system.") if windows?
+  end
+
   def support_self_recursive_equal?
     self_recursive_hash1 = {}
     self_recursive_hash1["next"] = self_recursive_hash1
@@ -186,4 +209,10 @@ module GroongaTestUtils
   def check_mecab_availability
     omit("MeCab isn't available") if context["TokenMecab"].nil?
   end
+
+  def need_groonga(major, minor, micro)
+    if (Groonga::BUILD_VERSION[0, 3] <=> [major, minor, micro]) < 0
+      omit("Groonga #{major}.#{minor}.#{micro} or later is required")
+    end
+  end
 end

data/test/run-test.rb

@@ -17,8 +17,6 @@
 
 $VERBOSE = true
 
-$KCODE = "u" if RUBY_VERSION < "1.9"
-
 base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 ext_dir = File.join(base_dir, "ext", "groonga")
 lib_dir = File.join(base_dir, "lib")
@@ -39,7 +37,7 @@ end
 require "test-unit"
 require "test/unit/priority"
 
-Test::Unit::Priority.enable
+Test::Unit::Priority.enable unless ENV["CI"]
 
 
 groonga_command_dir = File.join(base_dir, "..", "groonga-command")

data/test/test-accessor.rb

@@ -19,12 +19,13 @@ class AccessorTest < Test::Unit::TestCase
 
   def setup
     setup_database
-    @posts = Groonga::Hash.create(:name => "Posts", :key_type => "ShortText")
+    @posts = Groonga::Hash.create(:name => "Posts",
+                                  :key_type => "ShortText",
+                                  :value_type => "UInt32")
+    @grouped_posts = @posts.group("_key")
     @id = @posts.column("_id")
-  end
-
-  def teardown
-    @id = nil
+    @key = @posts.column("_key")
+    @value = @posts.column("_value")
   end
 
   def test_name
@@ -51,9 +52,8 @@ class AccessorTest < Test::Unit::TestCase
 
   sub_test_case "#key_accessor?" do
     test "true" do
-      key = @posts.column("_key")
       assert do
-        key.key_accessor?
+        @key.key_accessor?
       end
     end
 
@@ -63,4 +63,60 @@ class AccessorTest < Test::Unit::TestCase
       end
     end
   end
+
+  sub_test_case "#id_accessor?" do
+    test "true" do
+      assert do
+        @id.id_accessor?
+      end
+    end
+
+    test "false" do
+      assert do
+        not @key.id_accessor?
+      end
+    end
+  end
+
+  sub_test_case "#value_accessor?" do
+    test "true" do
+      assert do
+        @value.value_accessor?
+      end
+    end
+
+    test "false" do
+      assert do
+        not @key.value_accessor?
+      end
+    end
+  end
+
+  sub_test_case "#score_accessor?" do
+    test "true" do
+      assert do
+        @posts.select.column("_score").score_accessor?
+      end
+    end
+
+    test "false" do
+      assert do
+        not @key.score_accessor?
+      end
+    end
+  end
+
+  sub_test_case "#n_sub_records_accessor?" do
+    test "true" do
+      assert do
+        @grouped_posts.column("_nsubrecs").n_sub_records_accessor?
+      end
+    end
+
+    test "false" do
+      assert do
+        not @key.n_sub_records_accessor?
+      end
+    end
+  end
 end

data/test/test-column.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2020  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
@@ -307,6 +307,17 @@ class ColumnTest < Test::Unit::TestCase
     assert_false(post["hidden"])
   end
 
+  def test_float32
+    need_groonga(10, 0, 2)
+
+    numbers = Groonga::Array.create(:name => "Numbers")
+    numbers.define_column("data", "Float32")
+
+    number = numbers.add
+    number["data"] = 1.1
+    assert_in_delta(1.1, number["data"])
+  end
+
   def test_indexes
     Groonga::Schema.define do |schema|
       schema.create_table("Comments") do |table|

data/test/test-context.rb

@@ -132,6 +132,31 @@ class ContextTest < Test::Unit::TestCase
     assert_equal(-1, context.match_escalation_threshold)
   end
 
+  sub_test_case("#force_match_escalation?") do
+    def setup
+      default_force_match_escalation = context.force_match_escalation?
+      begin
+        yield
+      ensure
+        context.force_match_escalation = default_force_match_escalation
+      end
+    end
+
+    def test_true
+      context.force_match_escalation = true
+      assert do
+        context.force_match_escalation?
+      end
+    end
+
+    def test_false
+      context.force_match_escalation = false
+      assert do
+        not context.force_match_escalation?
+      end
+    end
+  end
+
   def test_close
     context = Groonga::Context.new
     assert_false(context.closed?)