rroonga 6.0.0-x86-mingw32 → 6.0.2-x86-mingw32

data/ext/groonga/rb-grn-request-timer.c

@@ -0,0 +1,155 @@
+/* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+  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
+*/
+
+#include "rb-grn.h"
+
+/*
+ * Document-module: Groonga::RequestTimer
+ *
+ * This module provides API for canceling requests after the specified
+ * time.
+ */
+
+VALUE rb_mGrnRequestTimer;
+
+/*
+ * Registers a request with timeout. If the request isn't finished
+ * after the specified timeout, the request is canceled.
+ *
+ * @example Register a request that will be timed out after 2.9 seconds
+ *   request_id = "request-29"
+ *   timeout_in_second = 2.9
+ *   Groonga::RequestTimer.register(request_id, timeout_in_second)
+ *
+ * @overload register(request_id, timeout=nil)
+ *   @param request_id [String] The ID of request to be registered.
+ *   @param timeout (nil) [Float, nil] The timeout in second. If
+ *      `timeout` is `nil`, {Groonga::RequestTimer.default_timeout} is
+ *      used.
+ *   @return [Groonga::RequestTimerID] The ID of the request timer.
+ *
+ * @since 6.0.2
+ */
+static VALUE
+rb_grn_request_timer_s_register (int argc, VALUE *argv, VALUE module)
+{
+    VALUE rb_request_id;
+    VALUE rb_timeout;
+    const char *request_id;
+    unsigned int request_id_size;
+    double timeout;
+    void *timer_id;
+
+    rb_scan_args(argc, argv, "11", &rb_request_id, &rb_timeout);
+
+    request_id = StringValuePtr(rb_request_id);
+    request_id_size = RSTRING_LEN(rb_request_id);
+    if (NIL_P(rb_timeout)) {
+      timeout = grn_get_default_request_timeout();
+    } else {
+      timeout = NUM2DBL(rb_timeout);
+    }
+    timer_id = grn_request_timer_register(request_id, request_id_size, timeout);
+
+    return GRN_REQUEST_TIMER_ID2RVAL(timer_id);
+}
+
+/*
+ * Unregisters the specified request timer.
+ *
+ * @example Unregister a request timer by ID
+ *   timer_id = Groonga::RequestTimer.register("request-29", 2.9)
+ *   Groonga::RequestTimer.unregister(timer_id)
+ *
+ * @overload unregister(timer_id)
+ *   @param timer_id [Groonga::RequestTimerID] The ID of request timer
+ *      to be unregistered.
+ *   @return [void]
+ *
+ * @since 6.0.2
+ */
+static VALUE
+rb_grn_request_timer_s_unregister (VALUE module, VALUE rb_timer_id)
+{
+    void *timer_id;
+
+    timer_id = RVAL2GRN_REQUEST_TIMER_ID(rb_timer_id);
+    grn_request_timer_unregister(timer_id);
+
+    return Qnil;
+}
+
+/*
+ * Gets the default timeout used by request timer.
+ *
+ * @example Gets the default timeout
+ *   Groonga::RequestTimer.default_timeout
+ *
+ * @overload default_timeout
+ *   @return [Float] The default timeout used by request timer.
+ *
+ * @since 6.0.2
+ */
+static VALUE
+rb_grn_request_timer_s_get_default_timeout (VALUE module)
+{
+    double timeout;
+
+    timeout = grn_get_default_request_timeout();
+
+    return rb_float_new(timeout);
+}
+
+/*
+ * Sets the default timeout used by request timer.
+ *
+ * @example Sets the default timeout
+ *   Groonga::RequestTimer.default_timeout = 2.9
+ *
+ * @overload default_timeout=(timeout)
+ *   @return [Float] The default timeout used by request timer. If
+ *     `timeout` is `0.0`, the default timeout is disabled.
+ *   @return [void]
+ *
+ * @since 6.0.2
+ */
+static VALUE
+rb_grn_request_timer_s_set_default_timeout (VALUE module, VALUE rb_timeout)
+{
+    double timeout;
+
+    timeout = NUM2DBL(rb_timeout);
+    grn_set_default_request_timeout(timeout);
+
+    return Qnil;
+}
+
+void
+rb_grn_init_request_timer (VALUE mGrn)
+{
+    rb_mGrnRequestTimer = rb_define_module_under(mGrn, "RequestTimer");
+
+    rb_define_singleton_method(rb_mGrnRequestTimer, "register",
+                               rb_grn_request_timer_s_register, -1);
+    rb_define_singleton_method(rb_mGrnRequestTimer, "unregister",
+                               rb_grn_request_timer_s_unregister, 1);
+    rb_define_singleton_method(rb_mGrnRequestTimer, "default_timeout",
+                               rb_grn_request_timer_s_get_default_timeout, 0);
+    rb_define_singleton_method(rb_mGrnRequestTimer, "default_timeout=",
+                               rb_grn_request_timer_s_set_default_timeout, 1);
+}

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-2012  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
@@ -173,6 +173,18 @@ rb_grn_type_variable_size_p (VALUE self)
     return CBOOL2RVAL(type->header.flags & GRN_OBJ_KEY_VAR_SIZE);
 }
 
+static VALUE
+rb_grn_type_builtin_p (VALUE self)
+{
+    grn_ctx *context = NULL;
+    grn_obj *type;
+    grn_id id;
+
+    type = RVAL2GRNOBJECT(self, &context);
+    id =  grn_obj_id(context, type);
+    return CBOOL2RVAL(grn_type_id_is_builtin(context, id));
+}
+
 static VALUE
 rb_grn_type_unsigned_integer_p (VALUE self)
 {
@@ -217,6 +229,30 @@ rb_grn_type_geo_point_p (VALUE self)
     return CBOOL2RVAL(key_type == GRN_OBJ_KEY_GEO_POINT);
 }
 
+static VALUE
+rb_grn_type_text_family_p (VALUE self)
+{
+    grn_ctx *context = NULL;
+    grn_obj *type;
+    grn_id id;
+
+    type = RVAL2GRNOBJECT(self, &context);
+    id =  grn_obj_id(context, type);
+    return CBOOL2RVAL(grn_type_id_is_text_family(context, id));
+}
+
+static VALUE
+rb_grn_type_number_family_p (VALUE self)
+{
+    grn_ctx *context = NULL;
+    grn_obj *type;
+    grn_id id;
+
+    type = RVAL2GRNOBJECT(self, &context);
+    id =  grn_obj_id(context, type);
+    return CBOOL2RVAL(grn_type_id_is_number_family(context, id));
+}
+
 void
 rb_grn_init_type (VALUE mGrn)
 {
@@ -229,6 +265,9 @@ rb_grn_init_type (VALUE mGrn)
     rb_define_method(rb_cGrnType, "variable_size?",
                      rb_grn_type_variable_size_p, 0);
 
+    rb_define_method(rb_cGrnType, "builtin?",
+                     rb_grn_type_builtin_p, 0);
+
     rb_define_method(rb_cGrnType, "unsigned_integer?",
                      rb_grn_type_unsigned_integer_p, 0);
     rb_define_alias(rb_cGrnType, "uint?", "unsigned_integer?");
@@ -238,6 +277,9 @@ rb_grn_init_type (VALUE mGrn)
 
     rb_define_method(rb_cGrnType, "float?", rb_grn_type_float_p, 0);
     rb_define_method(rb_cGrnType, "geo_point?", rb_grn_type_geo_point_p, 0);
+    rb_define_method(rb_cGrnType, "text_family?", rb_grn_type_text_family_p, 0);
+    rb_define_method(rb_cGrnType, "number_family?",
+                     rb_grn_type_number_family_p, 0);
 
     /* 任意のテーブルに属する全てのレコード(Object型はv1.2で
        サポートされます)。 */

data/ext/groonga/rb-grn.h

@@ -99,11 +99,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 6
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 0
-
-#define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
-
-#include <stdint.h>
+#define RB_GRN_MICRO_VERSION 2
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))
@@ -300,6 +296,9 @@ RB_GRN_VAR VALUE rb_cGrnColumnExpressionBuilder;
 RB_GRN_VAR VALUE rb_cGrnPlugin;
 RB_GRN_VAR VALUE rb_cGrnNormalizer;
 RB_GRN_VAR VALUE rb_cGrnIndex;
+RB_GRN_VAR VALUE rb_mGrnRequestCanceler;
+RB_GRN_VAR VALUE rb_mGrnRequestTimer;
+RB_GRN_VAR VALUE rb_cGrnRequestTimerID;
 
 void           rb_grn_init_utils                    (VALUE mGrn);
 void           rb_grn_init_exception                (VALUE mGrn);
@@ -355,6 +354,9 @@ void           rb_grn_init_normalizer               (VALUE mGrn);
 void           rb_grn_init_thread                   (VALUE mGrn);
 void           rb_grn_init_config                   (VALUE mGrn);
 void           rb_grn_init_index                    (VALUE mGrn);
+void           rb_grn_init_request_canceler         (VALUE mGrn);
+void           rb_grn_init_request_timer            (VALUE mGrn);
+void           rb_grn_init_request_timer_id         (VALUE mGrn);
 
 VALUE          rb_grn_rc_to_exception               (grn_rc rc);
 const char    *rb_grn_rc_to_message                 (grn_rc rc);
@@ -738,6 +740,11 @@ VALUE          rb_grn_index_new                     (VALUE rb_index_column,
 #define RVAL2GRNVARIABLE(object, context) \
     (rb_grn_variable_from_ruby_object(object, context))
 
+#define GRN_REQUEST_TIMER_ID2RVAL(id) \
+    (rb_grn_request_timer_id_to_ruby_object(id))
+#define RVAL2GRN_REQUEST_TIMER_ID(rb_id) \
+    (rb_grn_request_timer_id_from_ruby_object(rb_id))
+
 
 grn_encoding   rb_grn_encoding_from_ruby_object     (VALUE object,
                                                      grn_ctx *context);
@@ -882,6 +889,11 @@ VALUE          rb_grn_obj_to_ruby_object            (VALUE klass,
                                                      grn_obj *obj,
                                                      VALUE related_object);
 
+void          *rb_grn_request_timer_id_from_ruby_object
+                                                    (VALUE rb_id);
+VALUE          rb_grn_request_timer_id_to_ruby_object
+                                                    (void *id);
+
 void           rb_grn_snippet_bind                  (RbGrnSnippet *rb_grn_snippet,
                                                      grn_ctx *context,
                                                      grn_obj *snippet);

data/ext/groonga/rb-groonga.c

@@ -249,4 +249,7 @@ Init_groonga (void)
     rb_grn_init_thread(mGrn);
     rb_grn_init_config(mGrn);
     rb_grn_init_index(mGrn);
+    rb_grn_init_request_canceler(mGrn);
+    rb_grn_init_request_timer(mGrn);
+    rb_grn_init_request_timer_id(mGrn);
 }

data/lib/groonga/expression-builder.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2015  Masafumi Yokoyama <yokoyama@clear-code.com>
 # Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
 #
@@ -77,23 +75,16 @@ module Groonga
       builders << match(@query, default_parse_options) if @query
       if block_given?
         custom_builder = yield(self)
-        if custom_builder.is_a?(::Array)
-          builders.concat(custom_builder)
-        else
-          builders << custom_builder
-        end
+        builders << custom_builder
+        builders.flatten!
       end
 
       if builders.empty?
         expression.append_object(@table.context["all_records"])
         expression.append_operation(Operation::CALL, 0)
       else
-        combined_builder = builders.inject(nil) do |previous, builder|
-          if previous.nil?
-            builder
-          else
-            previous & builder
-          end
+        combined_builder = builders.inject do |previous, builder|
+          previous & builder
         end
         combined_builder.build(expression, variable)
       end

data/rroonga-build.rb

@@ -20,15 +20,15 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 6
     MINOR = 0
-    MICRO = 0
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2016, 2, 29)
+    RELEASED_DATE = Time.utc(2016, 4, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 6
     MINOR = 0
-    MICRO = 0
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/rroonga.gemspec

@@ -1,6 +1,6 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-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
@@ -86,7 +86,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("json")
   s.add_runtime_dependency("archive-zip")
   s.add_development_dependency("test-unit", [">= 3.0.0"])
-  s.add_development_dependency("test-unit-notify")
   s.add_development_dependency("rake")
   s.add_development_dependency("rake-compiler", [">= 0.9.5"])
   s.add_development_dependency("rake-compiler-dock")

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009-2013  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
@@ -37,7 +37,7 @@ if make
 end
 
 require "test-unit"
-require "test/unit/notify"
+require "test/unit/priority"
 
 Test::Unit::Priority.enable
 

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