rroonga 9.0.3 → 9.0.7

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

@@ -2,6 +2,7 @@
 /*
   Copyright (C) 2009-2017  Kouhei Sutou <kou@clear-code.com>
   Copyright (C) 2014-2016  Masafumi Yokoyama <yokoyama@clear-code.com>
+  Copyright (C) 2019  Horimoto Yasuhiro <horimoto@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,9 +30,9 @@ static ID id_array_set;
 /*
  * Document-class: Groonga::Table < Groonga::Object
  *
- * Rroongaが提供するテーブルのベースとなるクラス。このクラス
- * から {Groonga::Array} , {Groonga::Hash} , {Groonga::PatriciaTrie}
- * が継承されている。
+ * This class is base class which represents Rroonga's table.
+ * {Groonga::Array} , {Groonga::Hash} , {Groonga::PatriciaTrie}
+ * are extended from this class.
  */
 
 grn_obj *
@@ -183,7 +184,8 @@ rb_grn_table_inspect_content (VALUE self, VALUE inspected)
 }
 
 /*
- * テーブルの中身を人に見やすい文字列で返す。
+ * This function return contents of a table as a string.
+ * It's easy to understand for human.
  *
  * @overload inspect
  *   @return [String]
@@ -203,31 +205,33 @@ rb_grn_table_inspect (VALUE self)
 }
 
 /*
- * テーブルに名前が _name_ で型が _value_type_ のカラムを定義
- * し、新しく定義されたカラムを返す。
+ * Defines a column that name is `name` and type is `value_type`. It
+ * returns the newly defined column.
  *
  * @overload define_column(name, value_type, options={})
  *   @param options [::Hash] The name and value
  *     pairs. Omitted names are initialized as the default value.
- *   @option options :path
- *     カラムを保存するパス。
- *   @option options :persistent (永続カラム)
- *     +true+ を指定すると永続カラムとなる。省略した場合は永
- *     続カラムとなる。 +:path+ を省略した場合は自動的にパスが
- *     付加される。
+ *   @option options :path [String, nil] (nil)
+ *     The path to store the content of the column.
+ *     If this is omitted, path is generated automatically.
+ *   @option options :persistent [Boolean] (true)
+ *     Whether the column is a persistent column or not.
+ *     If this is `true` and `:path` is omitted, path is generated
+ *     automatically.
  *   @option options :type (:scalar)
- *     カラムの値の格納方法について指定する。省略した場合は、
- *     +:scalar+ になる。
+ *     This option specifies how to store a value of a column.
+ *     If this option is omitted, +:scalar+ is used.
  *
- *     - +:scalar+ := スカラ値(単独の値)を格納する。
- *     - +:vector+ := 値の配列を格納する。
+ *     - +:scalar+ := Store scalar value.
+ *     - +:vector+ := Store array value.
  *   @option options [Boolean] :with_weight (false)
  *     It specifies whether making the column weight vector column or not.
  *     Weight vector column can store weight for each element.
  *
  *     You can't use this option for scalar column.
  *   @option options :compress
- *     値の圧縮方法を指定する。省略した場合は、圧縮しない。
+ *     This option specifies how to compress values.
+ *     If we omit this option, values are not compressed.
  *
  *     * `:zlib`: Compressed by zlib.
  *     * `:lz4`: Compressed by LZ4.
@@ -345,32 +349,37 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * テーブルに名前が _name_ で型が _value_type_ のインデックスカ
- * ラムを定義し、新しく定義されたカラムを返す。
+ * Defines an index column that name is `name` and type is
+ * `value_type`. It returns the newly defined index column.
  *
  * @overload define_index_column(name, value_type, options={})
  *   @param options [::Hash] The name and value
  *     pairs. Omitted names are initialized as the default value.
- *   @option options :path
- *     カラムを保存するパス。
- *   @option options :persistent (永続カラム)
- *     +true+ を指定すると永続カラムとなる。省略した場合は永
- *     続カラムとなる。 +:path+ を省略した場合は自動的にパスが
- *     付加される。
- *   @option options :with_section
- *     転置索引にsection(段落情報)を合わせて格納する。
- *   @option options :with_weight
- *     転置索引にweight情報を合わせて格納する。
- *   @option options :with_position
- *     転置索引に出現位置情報を合わせて格納する。
- *   @option options :size (nil)
- *     The size of index column. It must be `nil`, `:small` or
- *     `:medium`. `nil` means full size. `:small` means small
- *     size. `:medium` means medium size.
- *   @option options :source
- *    インデックス対象となるカラムを指定する。 +:sources+ との併用はできない。
- *   @option options :sources
- *    インデックス対象となる複数のカラムを指定する。 +:source+ との併用はできない。
+ *   @option options :path [String, nil] (nil)
+ *     The path to store the content of the index column.
+ *     If this is omitted, path is generated automatically.
+ *   @option options :persistent [Boolean] (true)
+ *     Whether the index column is a persistent indent column or not.
+ *     If this is `true` and `:path` is omitted, path is generated
+ *     automatically.
+ *   @option options :with_section [Boolean] (false)
+ *     Whether section information is stored to the index column or not.
+ *   @option options :with_weight [Boolean] (false)
+ *     Whether weight information is stored to the index column or not.
+ *   @option options :with_position [Boolean] (false)
+ *     Whether position information is stored to the index column or not.
+ *   @option options :size [Symbol, nil] (nil)
+ *     The size of index column. It must be `nil`, `:small`,
+ *     `:medium` or `:large`. `nil` means the default size.
+ *     `:small` means small size. `:medium` means medium size. Medium size
+ *     is smaller than the default size. `:large` means large size.
+ *     Large size is larger than the default size.
+ *   @option options :source [Groonga::Column, nil] (nil)
+ *     Specifies the source column of the index column.
+ *     This option can't be used with `:sources`.
+ *   @option options :sources [::Array<Groonga::Column>, nil] (nil)
+ *     Specifies the source columns of the index column.
+ *     This option can't be used with `:source`.
  *
  * @return [Groonga::IndexColumn]
  */
@@ -461,9 +470,11 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self)
         flags |= GRN_OBJ_INDEX_SMALL;
     } else if (rb_grn_equal_option(rb_size, "medium")) {
         flags |= GRN_OBJ_INDEX_MEDIUM;
+    } else if (rb_grn_equal_option(rb_size, "large")) {
+        flags |= GRN_OBJ_INDEX_LARGE;
     } else {
         rb_raise(rb_eArgError,
-                 ":size must be nil, :small or :medium: <%" PRIsVALUE ">",
+                 ":size must be nil, :small, :medium or :large: <%" PRIsVALUE ">",
                  rb_size);
     }
 
@@ -2482,8 +2493,8 @@ rb_grn_table_support_key_p (VALUE self)
 /*
  * @overload support_value?
  *
- *   @return @true@ if the table is created with value type, @false@
- *   otherwise.
+ *   @return [Boolean] `true` if the table is created with value type,
+ *     `false` otherwise.
  */
 static VALUE
 rb_grn_table_support_value_p (VALUE self)
@@ -2517,6 +2528,19 @@ rb_grn_table_support_sub_records_p (VALUE self)
     return CBOOL2RVAL(grn_table_is_grouped(context, table));
 }
 
+/*
+ * @overload support_score?
+ *
+ *   @return [Boolean] `true` if the table has `_score` column,
+ *     `false` otherwise.
+ */
+static VALUE
+rb_grn_table_support_score_p (VALUE self)
+{
+    return CBOOL2RVAL(rb_grn_table_have_column(self,
+                                               rb_str_new_literal("_score")));
+}
+
 /*
  * {Groonga::Table#group} returns a table that contains grouped
  * records. If grouped table has a space to store the number of
@@ -2890,6 +2914,8 @@ rb_grn_init_table (VALUE mGrn)
                      rb_grn_table_support_value_p, 0);
     rb_define_method(rb_cGrnTable, "support_sub_records?",
                      rb_grn_table_support_sub_records_p, 0);
+    rb_define_method(rb_cGrnTable, "support_score?",
+                     rb_grn_table_support_score_p, 0);
     rb_define_method(rb_cGrnTable, "have_n_sub_records_space?",
                      rb_grn_table_have_n_sub_records_space_p, 0);
 

data/ext/groonga/rb-grn.h

@@ -99,7 +99,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 9
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 3
+#define RB_GRN_MICRO_VERSION 7
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

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/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

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

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

data/test/test-exception.rb

@@ -108,11 +108,16 @@ class TooManyOpenFilesTest < Test::Unit::TestCase
   include GroongaTestUtils
 
   def setup
+    @sub_context = nil
+    unless Process.const_defined?(:RLIMIT_NOFILE)
+      omit("No Process::RLIMIT_NOFILE")
+    end
     setup_database
     @sub_context = create_sub_context
   end
 
   def teardown
+    return if @sub_context.nil?
     @sub_context.database.close
     @sub_context.close
   end