rroonga 6.0.0-x64-mingw32 → 6.0.2-x64-mingw32

data/test/test-expression-builder.rb

@@ -186,6 +186,19 @@ class ExpressionBuilderTest < Test::Unit::TestCase
                    result.collect {|record| record.key.key})
     end
 
+    def test_and_array_nested
+      result = @users.select do |record|
+        conditions = []
+        conditions << [(record.hp > 100)]
+        conditions << []
+        conditions << [[[(record.hp < 200)]]]
+        conditions << [[]]
+        conditions
+      end
+      assert_equal(["gunyara-kun"],
+                   result.collect {|record| record.key.key})
+    end
+
     def test_or
       result = @users.select do |record|
         (record["hp"] == 150) | (record["hp"] > 150)
@@ -675,7 +688,6 @@ EOC
       end
 
       def test_search
-        omit("TODO: Enable me when Groonga 6.0.1 is released.")
         result = @tags.select do |record|
           record.key.fuzzy_search("Toym", :with_transposition => true)
         end

data/test/test-hash.rb

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
-# Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2016  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
@@ -443,4 +441,25 @@ class HashTest < Test::Unit::TestCase
     user_names = users.each.collect(&:key)
     assert_equal(["Alice", "Bob", "Carl"], user_names)
   end
+
+  class KeyLargeTest < self
+    def test_default
+      paths = Groonga::Hash.create(:name => "Paths",
+                                   :key_type => "ShortText")
+      inspected = context.execute_command("object_inspect",
+                                          :name => paths.name)
+      assert_equal((4 * 1024 * 1024 * 1024) - 1,
+                   inspected.body["key"]["max_total_size"])
+    end
+
+    def test_enable
+      paths = Groonga::Hash.create(:name => "Paths",
+                                   :key_type => "ShortText",
+                                   :key_large => true)
+      inspected = context.execute_command("object_inspect",
+                                          :name => paths.name)
+      assert_equal((1 * 1024 * 1024 * 1024 * 1024) - 1,
+                   inspected.body["key"]["max_total_size"])
+    end
+  end
 end

data/test/test-request-canceler.rb

@@ -0,0 +1,46 @@
+# Copyright (C) 2016  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
+# 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 RequestCancelerTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  def setup
+    @request_id = "request-29"
+  end
+
+  def teardown
+    Groonga::RequestCanceler.unregister(@request_id)
+  end
+
+  def test_cancel
+    assert do
+      not Groonga::RequestCanceler.cancel(@request_id)
+    end
+    Groonga::RequestCanceler.register(@request_id)
+    assert do
+      Groonga::RequestCanceler.cancel(@request_id)
+    end
+  end
+
+  def test_cancel_all
+    assert do
+      not Groonga::RequestCanceler.cancel_all
+    end
+    Groonga::RequestCanceler.register(@request_id)
+    assert do
+      Groonga::RequestCanceler.cancel_all
+    end
+  end
+end

data/test/test-request-timer.rb

@@ -0,0 +1,40 @@
+# Copyright (C) 2016  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
+# 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 RequestTimerTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  def setup
+    @request_id = "request-29"
+    @timeout = 2.9
+  end
+
+  def teardown
+  end
+
+  def test_register
+    timer_id = Groonga::RequestTimer.register(@request_id, @timeout)
+    assert do
+      timer_id.is_a?(Groonga::RequestTimerID)
+    end
+    Groonga::RequestTimer.unregister(timer_id)
+  end
+
+  def test_deafult_timeout
+    assert_in_delta(0.0, Groonga::RequestTimer.default_timeout, 0.01)
+    Groonga::RequestTimer.default_timeout = @timeout
+    assert_in_delta(@timeout, Groonga::RequestTimer.default_timeout, 0.01)
+  end
+end

data/test/test-table.rb

@@ -302,13 +302,49 @@ class TableTest < Test::Unit::TestCase
     end
   end
 
-  def test_remove
-    bookmarks_path = @tables_dir + "bookmarks"
-    bookmarks = Groonga::Array.create(:name => "Bookmarks",
-                                      :path => bookmarks_path.to_s)
-    assert_predicate(bookmarks_path, :exist?)
-    bookmarks.remove
-    assert_not_predicate(bookmarks_path, :exist?)
+  class RemoveTest < self
+    def test_default
+      bookmarks_path = @tables_dir + "bookmarks"
+      bookmarks = Groonga::Array.create(:name => "Bookmarks",
+                                        :path => bookmarks_path.to_s)
+      assert_predicate(bookmarks_path, :exist?)
+      bookmarks.remove
+      assert_not_predicate(bookmarks_path, :exist?)
+    end
+
+    def test_dependent
+      names_path = @tables_dir + "names"
+      names = Groonga::Hash.create(:name => "Names",
+                                   :path => names_path.to_s,
+                                   :key_type => "ShortText")
+      users_path = @tables_dir + "users"
+      Groonga::Hash.create(:name => "Users",
+                           :path => users_path.to_s,
+                           :key_type => "Names")
+      administrators_path = @tables_dir + "administrators"
+      Groonga::Hash.create(:name => "Administrator",
+                           :path => administrators_path.to_s,
+                           :key_type => "Names")
+      members_path = @tables_dir + "members"
+      members = Groonga::Hash.create(:name => "Members",
+                                     :path => members_path.to_s,
+                                     :key_type => "ShortText")
+      members_name_path = @columns_dir + "name"
+      members.define_column("name", "Names",
+                            :path => members_name_path.to_s)
+
+      assert {names_path.exist?}
+      assert {users_path.exist?}
+      assert {administrators_path.exist?}
+      assert {members_path.exist?}
+      assert {members_name_path.exist?}
+      names.remove(:dependent => true)
+      assert {not names_path.exist?}
+      assert {not users_path.exist?}
+      assert {not administrators_path.exist?}
+      assert {members_path.exist?}
+      assert {not members_name_path.exist?}
+    end
   end
 
   def test_temporary_add

data/test/test-type.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2015  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -91,6 +91,106 @@ class TypeTest < Test::Unit::TestCase
     assert_false(Groonga["UInt32"].geo_point?)
   end
 
+  class TextFamilyTest < self
+    def test_short_text
+      assert do
+        Groonga["ShortText"].text_family?
+      end
+    end
+
+    def test_text
+      assert do
+        Groonga["Text"].text_family?
+      end
+    end
+
+    def test_long_text
+      assert do
+        Groonga["LongText"].text_family?
+      end
+    end
+
+    def test_under_short_text
+      assert do
+        not Groonga["Time"].text_family?
+      end
+    end
+
+    def test_over_long_text
+      assert do
+        not Groonga["TokyoGeoPoint"].text_family?
+      end
+    end
+  end
+
+  class NumberFamilyTest < self
+    def test_int8
+      assert do
+        Groonga["Int8"].number_family?
+      end
+    end
+
+    def test_uint8
+      assert do
+        Groonga["UInt8"].number_family?
+      end
+    end
+
+    def test_int16
+      assert do
+        Groonga["Int16"].number_family?
+      end
+    end
+
+    def test_uint16
+      assert do
+        Groonga["UInt16"].number_family?
+      end
+    end
+
+    def test_int32
+      assert do
+        Groonga["Int32"].number_family?
+      end
+    end
+
+    def test_uint32
+      assert do
+        Groonga["UInt32"].number_family?
+      end
+    end
+
+    def test_int64
+      assert do
+        Groonga["Int64"].number_family?
+      end
+    end
+
+    def test_uint64
+      assert do
+        Groonga["UInt64"].number_family?
+      end
+    end
+
+    def test_float
+      assert do
+        Groonga["Float"].number_family?
+      end
+    end
+
+    def test_under_int8
+      assert do
+        not Groonga["Bool"].number_family?
+      end
+    end
+
+    def test_over_float
+      assert do
+        not Groonga["Time"].number_family?
+      end
+    end
+  end
+
   def test_builtins
     assert_equal_type("Object", Groonga::Type::OBJECT) # FIXME!!!
     assert_equal_type("Bool", Groonga::Type::BOOLEAN)
@@ -125,7 +225,9 @@ class TypeTest < Test::Unit::TestCase
        "builtin - Time" => "Time")
   def test_builtin?(name)
     type = Groonga[name]
-    assert_predicate(type, :builtin?)
+    assert do
+      type.builtin?
+    end
   end
 
   private

data/vendor/local/etc/groonga/httpd/groonga-httpd.conf

@@ -1,9 +1,17 @@
 worker_processes 1;
+pid ${prefix}/var/run/groonga-httpd.pid;
 
 # Match this to the file owner of Groonga database files if groonga-httpd is
 # run as root.
 user groonga groonga;
 
+env GRN_IN_VALUES_TOO_MANY_INDEX_MATCH_RATIO;
+env GRN_BETWEEN_TOO_MANY_INDEX_MATCH_RATIO;
+env GRN_II_CURSOR_SET_MIN_ENABLE;
+env GRN_INDEX_CHUNK_SPLIT_ENABLE;
+env GRN_MECAB_CHUNKED_TOKENIZE_ENABLED;
+env GRN_MECAB_CHUNK_SIZE_THRESHOLD;
+
 events {
   worker_connections 1024;
 }

data/vendor/local/include/groonga/groonga.h

@@ -34,6 +34,7 @@
 #include "groonga/output.h"
 #include "groonga/pat.h"
 #include "groonga/request_canceler.h"
+#include "groonga/request_timer.h"
 #include "groonga/thread.h"
 #include "groonga/type.h"
 #include "groonga/util.h"

data/vendor/local/include/groonga/groonga/dump.h

@@ -23,7 +23,7 @@ extern "C" {
 #endif
 
 GRN_API grn_rc grn_dump_table_create_flags(grn_ctx *ctx,
-                                           grn_obj_flags flags,
+                                           grn_table_flags flags,
                                            grn_obj *buffer);
 GRN_API grn_rc grn_dump_column_create_flags(grn_ctx *ctx,
                                             grn_obj_flags flags,

data/vendor/local/include/groonga/groonga/expr.h

@@ -42,6 +42,7 @@ GRN_API grn_obj *grn_expr_get_var(grn_ctx *ctx, grn_obj *expr,
 GRN_API grn_obj *grn_expr_get_var_by_offset(grn_ctx *ctx, grn_obj *expr, unsigned int offset);
 GRN_API grn_rc grn_expr_clear_vars(grn_ctx *ctx, grn_obj *expr);
 
+GRN_API void grn_expr_take_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj);
 
 GRN_API grn_obj *grn_expr_append_obj(grn_ctx *ctx, grn_obj *expr, grn_obj *obj,
                                      grn_operator op, int nargs);
@@ -52,8 +53,6 @@ GRN_API grn_obj *grn_expr_append_const_str(grn_ctx *ctx, grn_obj *expr,
                                            grn_operator op, int nargs);
 GRN_API grn_obj *grn_expr_append_const_int(grn_ctx *ctx, grn_obj *expr, int i,
                                            grn_operator op, int nargs);
-GRN_API grn_obj *grn_expr_append_const_ptr(grn_ctx *ctx, grn_obj *expr, grn_obj *ptr,
-                                           grn_operator op, int nargs);
 GRN_API grn_rc grn_expr_append_op(grn_ctx *ctx, grn_obj *expr, grn_operator op, int nargs);
 
 GRN_API grn_rc grn_expr_get_keywords(grn_ctx *ctx, grn_obj *expr, grn_obj *keywords);

data/vendor/local/include/groonga/groonga/groonga.h

@@ -36,7 +36,7 @@ extern "C" {
 #endif /* GRN_API */
 
 typedef unsigned int grn_id;
-typedef unsigned char grn_bool;
+typedef uint8_t grn_bool;
 
 #define GRN_ID_NIL                     (0x00)
 #define GRN_ID_MAX                     (0x3fffffff)
@@ -124,7 +124,8 @@ typedef enum {
   GRN_TOKEN_FILTER_ERROR = -73,
   GRN_COMMAND_ERROR = -74,
   GRN_PLUGIN_ERROR = -75,
-  GRN_SCORER_ERROR = -76
+  GRN_SCORER_ERROR = -76,
+  GRN_CANCEL = -77
 } grn_rc;
 
 GRN_API grn_rc grn_init(void);
@@ -290,7 +291,12 @@ GRN_API grn_encoding grn_encoding_parse(const char *name);
 
 /* obj */
 
-typedef unsigned short int grn_obj_flags;
+typedef uint16_t grn_obj_flags;
+typedef uint32_t grn_table_flags;
+
+/* flags for grn_obj_flags and grn_table_flags */
+
+#define GRN_OBJ_FLAGS_MASK             (0xffff)
 
 #define GRN_OBJ_TABLE_TYPE_MASK        (0x07)
 #define GRN_OBJ_TABLE_HASH_KEY         (0x00)
@@ -335,6 +341,8 @@ typedef unsigned short int grn_obj_flags;
 #define GRN_OBJ_UNIT_USERDEF_SECTION   (0x07<<8)
 #define GRN_OBJ_UNIT_USERDEF_POSITION  (0x08<<8)
 
+/* Don't use (0x01<<12) because it's used internally. */
+
 #define GRN_OBJ_NO_SUBREC              (0x00<<13)
 #define GRN_OBJ_WITH_SUBREC            (0x01<<13)
 
@@ -343,6 +351,10 @@ typedef unsigned short int grn_obj_flags;
 #define GRN_OBJ_TEMPORARY              (0x00<<15)
 #define GRN_OBJ_PERSISTENT             (0x01<<15)
 
+/* flags only for grn_table_flags */
+
+#define GRN_OBJ_KEY_LARGE              (0x01<<16)
+
 /* obj types */
 
 #define GRN_VOID                       (0x00)
@@ -531,7 +543,7 @@ GRN_API grn_proc_type grn_proc_get_type(grn_ctx *ctx, grn_obj *proc);
 
 GRN_API grn_obj *grn_table_create(grn_ctx *ctx,
                                   const char *name, unsigned int name_size,
-                                  const char *path, grn_obj_flags flags,
+                                  const char *path, grn_table_flags flags,
                                   grn_obj *key_type, grn_obj *value_type);
 
 #define GRN_TABLE_OPEN_OR_CREATE(ctx,name,name_size,path,flags,key_type,value_type,table) \
@@ -645,7 +657,7 @@ GRN_API int grn_table_sort(grn_ctx *ctx, grn_obj *table, int offset, int limit,
                            grn_obj *result, grn_table_sort_key *keys, int n_keys);
 
 typedef struct _grn_table_group_result grn_table_group_result;
-typedef unsigned int grn_table_group_flags;
+typedef uint32_t grn_table_group_flags;
 
 #define GRN_TABLE_GROUP_CALC_COUNT     (0x01<<3)
 #define GRN_TABLE_GROUP_CALC_MAX       (0x01<<4)
@@ -893,6 +905,7 @@ GRN_API int grn_obj_get_values(grn_ctx *ctx, grn_obj *obj, grn_id offset, void *
 
 GRN_API grn_rc grn_obj_set_value(grn_ctx *ctx, grn_obj *obj, grn_id id, grn_obj *value, int flags);
 GRN_API grn_rc grn_obj_remove(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_rc grn_obj_remove_dependent(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_rc grn_obj_rename(grn_ctx *ctx, grn_obj *obj,
                               const char *name, unsigned int name_size);
 GRN_API grn_rc grn_table_rename(grn_ctx *ctx, grn_obj *table,