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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e8bd63b72b7bdfb0914765da93e6364f7403c3
-  data.tar.gz: 16d6fe0a556a6aec2a850558732894c4c94c8449
+  metadata.gz: 8481cfd25295fb47cb6f4b963f2a9dcfe6e38b63
+  data.tar.gz: 781043b0f0e7d313cfb77c65a0bce2d76d202fc0
 SHA512:
-  metadata.gz: d22cb48202a79038497e599ec2266042784cdfc342b6443e0cd6a3ae186e5a50d15901c2b21056123cc7853e7654788efce034287baee4889f1fb884961e5618
-  data.tar.gz: ef049636e46824e592079d009b199d1b7f6582514f3e2e212f40f7aa180256ff4762e1384e072e8e1bd1a356143e7be451ad6d9ae6553d726dc0a8e2de29bbfb
+  metadata.gz: 22a114ef30cdb07b244c7092794e47430f9c49c91c7a9a0f882d49941ff53c1d06a60ee54a0c250ab87b4ea194c2b12f45d18d5217ebd670d2e8bd39b1edfa63
+  data.tar.gz: b27ad9d22771e42295b8b60022e993eabc04a9e2745ff83ec69f33e81725438ce4b52d0c564a21dcb029b5e072f56be7db010228e14726f2e2ecc7529437934a

data/doc/text/news.md

@@ -1,5 +1,42 @@
 # NEWS
 
+## 6.0.2 2016-05-18 {#version-6-0-2}
+
+### Improvements
+
+  * Supported Groonga 6.0.2. Groonga 6.0.1 or older aren't supported.
+
+  * {Groonga::Table#select}: Supported nested array as conditions.
+
+  * Supported HTTP proxy with authentication on install.
+    [GitHub#129] [Patch by ngram]
+
+  * {Groonga::Cancel}: Added a new error class.
+
+  * {Groonga::Table#select}: Supported passing Hash as function argument.
+
+  * {Groonga::Hash.create}: Added `:key_large` option to create hash
+    table that supports 1TiB total key size.
+
+  * {Groonga::Type#text_family?}: Added a new predicate that returns
+    `true` for `ShortText`, `Text` and `LongText` types.
+
+  * {Groonga::Type#number_family?}: Added a new predicate that returns
+    `true` for `UInt8`, `Int8`, ..., `UInt64`, `Int64` and `Float`
+    types.
+
+  * {Groonga::Type#builtin?}: Added a new predicate that returns
+    `true` for builtin types such as `Int32`.
+
+  * {Groonga::Object#remove}: Added `:dependent` option to remove all
+    tables and columns that depend on the object.
+
+  * {Groonga::RequestCanceler}: Added an interface that cancels one or
+    more requests.
+
+  * {Groonga::RequestTimer}: Added an interface that provides request
+    timeout feature.
+
 ## 6.0.0: 2016-03-06 {#version-6-0-0}
 
 ### Improvements
@@ -22,7 +59,7 @@
     as number object. The number object was always treated as ID not
     key.
 
-    It's backward compatible change but we introduced the
+    It's backward incompatible change but we introduced the
     change. Because we marked this behavior as a bug.
 
   * Supported `require "rroonga"` for `Bundler.require`.

data/ext/groonga/extconf.rb

@@ -21,6 +21,7 @@ require "mkmf"
 require "fileutils"
 require "shellwords"
 require "open-uri"
+require "uri"
 
 require "pkg-config"
 
@@ -83,7 +84,19 @@ def download(url)
   if File.exist?(base_name)
     message(" skip (use downloaded file)\n")
   else
-    open(url, "rb") do |input|
+    options = {}
+    proxy_env = ENV["http_proxy"]
+    if proxy_env
+      proxy_url = URI.parse(proxy_env)
+      if proxy_url.user
+        options[:proxy_http_basic_authentication] = [
+          proxy_url,
+          proxy_url.user,
+          proxy_url.password,
+        ]
+      end
+    end
+    open(url, "rb", options) do |input|
       File.open(base_name, "wb") do |output|
         while (buffer = input.read(1024))
           output.print(buffer)

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

@@ -90,7 +90,7 @@ rb_grn_array_s_create (int argc, VALUE *argv, VALUE klass)
     grn_obj *value_type = NULL, *table;
     const char *name = NULL, *path = NULL;
     unsigned name_size = 0;
-    grn_obj_flags flags = GRN_OBJ_TABLE_NO_KEY;
+    grn_table_flags flags = GRN_OBJ_TABLE_NO_KEY;
     VALUE rb_table;
     VALUE options, rb_context, rb_name, rb_path, rb_persistent;
     VALUE rb_value_type, rb_sub_records;

data/ext/groonga/rb-grn-double-array-trie.c

@@ -245,7 +245,7 @@ rb_grn_double_array_trie_s_create (int argc, VALUE *argv, VALUE klass)
     grn_obj *key_type = NULL, *value_type = NULL, *table;
     const char *name = NULL, *path = NULL;
     unsigned name_size = 0;
-    grn_obj_flags flags = GRN_OBJ_TABLE_DAT_KEY;
+    grn_table_flags flags = GRN_OBJ_TABLE_DAT_KEY;
     VALUE rb_table;
     VALUE options, rb_context, rb_name, rb_path, rb_persistent;
     VALUE rb_key_normalize, rb_key_with_sis, rb_key_type;

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

@@ -100,6 +100,7 @@ static VALUE eGrnTokenFilterError;
 static VALUE eGrnCommandError;
 static VALUE eGrnPluginError;
 static VALUE eGrnScorerError;
+static VALUE eGrnCancel;
 
 VALUE
 rb_grn_rc_to_exception (grn_rc rc)
@@ -341,6 +342,9 @@ rb_grn_rc_to_exception (grn_rc rc)
       case GRN_SCORER_ERROR:
         exception = eGrnScorerError;
         break;
+      case GRN_CANCEL:
+        exception = eGrnCancel;
+        break;
     }
 
     if (NIL_P(exception))
@@ -589,6 +593,9 @@ rb_grn_rc_to_message (grn_rc rc)
       case GRN_SCORER_ERROR:
         message = "scorer error";
         break;
+      case GRN_CANCEL:
+        message = "cancel";
+        break;
     }
 
     if (!message)
@@ -1276,6 +1283,16 @@ rb_grn_init_exception (VALUE mGrn)
      *
      * @since 5.0.1
      */
-    eGrnPluginError =
+    eGrnScorerError =
         rb_define_class_under(mGrn, "ScorerError", rb_eGrnError);
+
+    /*
+     * Document-class: Groonga::Cancel
+     *
+     * It is used when a processing is canceled.
+     *
+     * @since 6.0.2
+     */
+    eGrnCancel =
+        rb_define_class_under(mGrn, "Cancel", rb_eGrnError);
 }

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

@@ -203,8 +203,6 @@ rb_grn_expression_define_variable (int argc, VALUE *argv, VALUE self)
     return rb_variable;
 }
 
-/* TODO: Enable when Groonga 6.0.1 is released. */
-/*
 typedef struct
 {
     grn_ctx *context;
@@ -238,7 +236,6 @@ rb_grn_hash_from_ruby_hash_body (VALUE rb_key,
 
     return ST_CONTINUE;
 }
-*/
 
 /*
  * _object_ を追加し、 _n_arguments_ 個の引数を取る _operation_ を追加する。
@@ -269,8 +266,6 @@ rb_grn_expression_append_object (int argc, VALUE *argv, VALUE self)
                                   NULL, NULL,
                                   NULL, NULL, NULL);
 
-    /* TODO: Enable when Groonga 6.0.1 is released. */
-    /*
     if (RB_TYPE_P(rb_object, RUBY_T_HASH)) {
         RbGrnHashFromRubyHashData data;
         data.context = context;
@@ -288,13 +283,10 @@ rb_grn_expression_append_object (int argc, VALUE *argv, VALUE self)
         grn_expr_append_obj(context, expression, (grn_obj *)(data.hash),
                             operation, n_arguments);
     } else {
-    */
         object = RVAL2GRNOBJECT(rb_object, &context);
         grn_expr_append_obj(context, expression, object,
                             operation, n_arguments);
-    /*
     }
-    */
     rb_grn_context_check(context, self);
     rb_ary_push(rb_iv_get(self, "@objects"), rb_object);
 

data/ext/groonga/rb-grn-hash.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
@@ -103,6 +103,12 @@ VALUE rb_cGrnHash;
  *
  *       @deprecated Use @:normalizer => "NormalizerAuto"@ instead.
  *
+ *     @option options [Boolean] :key_large (false)
+ *       It specifies whether total key size is large or not. The
+ *       default total key size is 4GiB. Large total key size is 1TiB.
+ *
+ *       @since 6.0.1
+ *
  *     @option options :key_type
  *       キーの種類を示すオブジェクトを指定する。キーの種類には型
  *       名（"Int32"や"ShortText"など）または {Groonga::Type} または
@@ -158,10 +164,12 @@ rb_grn_hash_s_create (int argc, VALUE *argv, VALUE klass)
     grn_obj *key_type = NULL, *value_type = NULL, *table;
     const char *name = NULL, *path = NULL;
     unsigned name_size = 0;
-    grn_obj_flags flags = GRN_OBJ_TABLE_HASH_KEY;
+    grn_table_flags flags = GRN_OBJ_TABLE_HASH_KEY;
     VALUE rb_table;
     VALUE options, rb_context, rb_name, rb_path, rb_persistent;
-    VALUE rb_key_normalize, rb_key_type, rb_value_type, rb_default_tokenizer;
+    VALUE rb_key_normalize;
+    VALUE rb_key_large;
+    VALUE rb_key_type, rb_value_type, rb_default_tokenizer;
     VALUE rb_token_filters;
     VALUE rb_sub_records;
     VALUE rb_normalizer;
@@ -174,6 +182,7 @@ rb_grn_hash_s_create (int argc, VALUE *argv, VALUE klass)
                         "path", &rb_path,
                         "persistent", &rb_persistent,
                         "key_normalize", &rb_key_normalize,
+                        "key_large", &rb_key_large,
                         "key_type", &rb_key_type,
                         "value_type", &rb_value_type,
                         "default_tokenizer", &rb_default_tokenizer,
@@ -201,6 +210,9 @@ rb_grn_hash_s_create (int argc, VALUE *argv, VALUE klass)
     if (RVAL2CBOOL(rb_key_normalize))
         flags |= GRN_OBJ_KEY_NORMALIZE;
 
+    if (RVAL2CBOOL(rb_key_large))
+        flags |= GRN_OBJ_KEY_LARGE;
+
     if (NIL_P(rb_key_type)) {
         key_type = grn_ctx_at(context, GRN_DB_SHORT_TEXT);
     } else {

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

@@ -28,9 +28,9 @@
 #define GRNLOGLEVEL2RVAL(level)    (rb_grn_log_level_to_ruby_object(level))
 #define RVAL2GRNLOGLEVEL(rb_level) (rb_grn_log_level_from_ruby_object(rb_level))
 
-VALUE cGrnLogger;
-VALUE mGrnLoggerFlags;
-VALUE cGrnCallbackLogger;
+VALUE rb_cGrnLogger;
+VALUE rb_mGrnLoggerFlags;
+VALUE rb_cGrnCallbackLogger;
 
 static ID id_caller_locations;
 static ID id_path;
@@ -333,7 +333,7 @@ rb_grn_logger_s_register (int argc, VALUE *argv, VALUE klass)
         if (!NIL_P(rb_logger)) {
             rb_options = rb_logger;
         }
-        rb_logger = rb_funcall(cGrnCallbackLogger, id_new, 1, rb_callback);
+        rb_logger = rb_funcall(rb_cGrnCallbackLogger, id_new, 1, rb_callback);
     }
 
     rb_grn_scan_options(rb_options,
@@ -361,7 +361,7 @@ rb_grn_logger_s_register (int argc, VALUE *argv, VALUE klass)
         flags |= GRN_LOG_LOCATION;
     }
     if (!NIL_P(rb_flags)) {
-        flags = rb_funcall(mGrnLoggerFlags, id_parse, 2,
+        flags = rb_funcall(rb_mGrnLoggerFlags, id_parse, 2,
                            INT2NUM(flags), rb_flags);
     }
 
@@ -617,34 +617,34 @@ rb_grn_init_logger (VALUE mGrn)
 
     rb_grn_logger.user_data = (void *)Qnil;
 
-    cGrnLogger = rb_define_class_under(mGrn, "Logger", rb_cObject);
+    rb_cGrnLogger = rb_define_class_under(mGrn, "Logger", rb_cObject);
 
-    rb_cv_set(cGrnLogger, "@@current_logger", Qnil);
-    rb_define_singleton_method(cGrnLogger, "log",
+    rb_cv_set(rb_cGrnLogger, "@@current_logger", Qnil);
+    rb_define_singleton_method(rb_cGrnLogger, "log",
                                rb_grn_logger_s_log, -1);
-    rb_define_singleton_method(cGrnLogger, "register",
+    rb_define_singleton_method(rb_cGrnLogger, "register",
                                rb_grn_logger_s_register, -1);
-    rb_define_singleton_method(cGrnLogger, "unregister",
+    rb_define_singleton_method(rb_cGrnLogger, "unregister",
                                rb_grn_logger_s_unregister, 0);
-    rb_define_singleton_method(cGrnLogger, "reopen",
+    rb_define_singleton_method(rb_cGrnLogger, "reopen",
                                rb_grn_logger_s_reopen, 0);
-    rb_define_singleton_method(cGrnLogger, "max_level",
+    rb_define_singleton_method(rb_cGrnLogger, "max_level",
                                rb_grn_logger_s_get_max_level, 0);
-    rb_define_singleton_method(cGrnLogger, "max_level=",
+    rb_define_singleton_method(rb_cGrnLogger, "max_level=",
                                rb_grn_logger_s_set_max_level, 1);
-    rb_define_singleton_method(cGrnLogger, "path",
+    rb_define_singleton_method(rb_cGrnLogger, "path",
                                rb_grn_logger_s_get_path, 0);
-    rb_define_singleton_method(cGrnLogger, "path=",
+    rb_define_singleton_method(rb_cGrnLogger, "path=",
                                rb_grn_logger_s_set_path, 1);
-    rb_define_singleton_method(cGrnLogger, "rotate_threshold_size",
+    rb_define_singleton_method(rb_cGrnLogger, "rotate_threshold_size",
                                rb_grn_logger_s_get_rotate_threshold_size, 0);
-    rb_define_singleton_method(cGrnLogger, "rotate_threshold_size=",
+    rb_define_singleton_method(rb_cGrnLogger, "rotate_threshold_size=",
                                rb_grn_logger_s_set_rotate_threshold_size, 1);
-    rb_set_end_proc(rb_grn_logger_reset, cGrnLogger);
+    rb_set_end_proc(rb_grn_logger_reset, rb_cGrnLogger);
 
-    mGrnLoggerFlags = rb_define_module_under(cGrnLogger, "Flags");
+    rb_mGrnLoggerFlags = rb_define_module_under(rb_cGrnLogger, "Flags");
 #define DEFINE_FLAG(NAME)                                       \
-    rb_define_const(mGrnLoggerFlags,                            \
+    rb_define_const(rb_mGrnLoggerFlags,                         \
                     #NAME, INT2NUM(GRN_LOG_ ## NAME))
     DEFINE_FLAG(TIME);
     DEFINE_FLAG(TITLE);
@@ -652,6 +652,6 @@ rb_grn_init_logger (VALUE mGrn)
     DEFINE_FLAG(LOCATION);
 #undef DEFINE_FLAG
 
-    cGrnCallbackLogger =
-        rb_define_class_under(mGrn, "CallbackLogger", cGrnLogger);
+    rb_cGrnCallbackLogger =
+        rb_define_class_under(mGrn, "CallbackLogger", rb_cGrnLogger);
 }

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

@@ -1461,23 +1461,45 @@ rb_grn_object_prepend_value (VALUE self, VALUE rb_id, VALUE rb_value)
 }
 
 /*
- * _object_ をメモリから解放し、それが永続オブジェクトであっ
- * た場合は、該当するファイル一式を削除する。
+ * Free the `object`. If the `object` is persistent object, all files
+ * related with the object are removed.
  *
- * @overload remove
+ * @overload remove(options={})
+ *
+ *   @param [::Hash] options The optional parameters.
+ *
+ *   @option options [Boolean] :dependent (false)
+ *     If it's `true`, all tables and columns that depend on the
+ *     `object`.
  */
 static VALUE
-rb_grn_object_remove (VALUE self)
+rb_grn_object_remove (int argc, VALUE *argv, VALUE self)
 {
     RbGrnObject *rb_grn_object;
     grn_ctx *context;
+    VALUE rb_options;
+    VALUE rb_dependent_p;
+    grn_bool dependent_p = GRN_FALSE;
 
     rb_grn_object = SELF(self);
     if (!rb_grn_object->object)
         return Qnil;
 
+    rb_scan_args(argc, argv, "01", &rb_options);
+    rb_grn_scan_options(rb_options,
+                        "dependent", &rb_dependent_p,
+                        NULL);
+
+    if (!NIL_P(rb_dependent_p)) {
+        dependent_p = RVAL2CBOOL(rb_dependent_p);
+    }
+
     context = rb_grn_object->context;
-    grn_obj_remove(context, rb_grn_object->object);
+    if (dependent_p) {
+        grn_obj_remove_dependent(context, rb_grn_object->object);
+    } else {
+        grn_obj_remove(context, rb_grn_object->object);
+    }
     rb_grn_context_check(context, self);
 
     rb_iv_set(self, "@context", Qnil);
@@ -1750,7 +1772,7 @@ rb_grn_init_object (VALUE mGrn)
     rb_define_method(rb_cGrnObject, "append", rb_grn_object_append_value, 2);
     rb_define_method(rb_cGrnObject, "prepend", rb_grn_object_prepend_value, 2);
 
-    rb_define_method(rb_cGrnObject, "remove", rb_grn_object_remove, 0);
+    rb_define_method(rb_cGrnObject, "remove", rb_grn_object_remove, -1);
 
     rb_define_method(rb_cGrnObject, "builtin?", rb_grn_object_builtin_p, 0);
     rb_define_method(rb_cGrnObject, "table?", rb_grn_object_table_p, 0);

data/ext/groonga/rb-grn-patricia-trie.c

@@ -166,7 +166,7 @@ rb_grn_patricia_trie_s_create (int argc, VALUE *argv, VALUE klass)
     grn_obj *key_type = NULL, *value_type = NULL, *table;
     const char *name = NULL, *path = NULL;
     unsigned name_size = 0;
-    grn_obj_flags flags = GRN_OBJ_TABLE_PAT_KEY;
+    grn_table_flags flags = GRN_OBJ_TABLE_PAT_KEY;
     VALUE rb_table;
     VALUE options, rb_context, rb_name, rb_path, rb_persistent;
     VALUE rb_key_normalize, rb_key_with_sis, rb_key_type;

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

@@ -0,0 +1,164 @@
+/* -*- 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::RequestCanceler
+ *
+ * This module provides API for canceling requests.
+ */
+
+VALUE rb_mGrnRequestCanceler;
+
+/*
+ * Registers a request. The request can be canceled by
+ * {Groonga::RequestCanceler.cancel}.
+ *
+ * @example Register a request
+ *   request_id = "request-29"
+ *   Groonga::RequestCanceler.register(request_id)
+ *
+ * @overload register(request_id)
+ *   @param request_id [String] The ID of request to be registered.
+ *   @return [void]
+ *
+ * @since 6.0.2
+ */
+static VALUE
+rb_grn_request_canceler_s_register (int argc, VALUE *argv, VALUE module)
+{
+    VALUE rb_request_id;
+    VALUE rb_options;
+    VALUE rb_context;
+    const char *request_id;
+    unsigned int request_id_size;
+    grn_ctx *context;
+
+    rb_scan_args(argc, argv, "11", &rb_request_id, &rb_options);
+    rb_grn_scan_options(rb_options,
+                        "context", &rb_context,
+                        NULL);
+    context = rb_grn_context_ensure(&rb_context);
+
+    request_id = StringValuePtr(rb_request_id);
+    request_id_size = RSTRING_LEN(rb_request_id);
+    grn_request_canceler_register(context, request_id, request_id_size);
+
+    return Qnil;
+}
+
+/*
+ * Unregisters the specified request.
+ *
+ * @example Unregister a request by ID
+ *   request_id = "request-29"
+ *   Groonga::RequestCanceler.unregister(request_id)
+ *
+ * @overload unregister(request_id)
+ *   @param request_id [String] The ID of request to be unregistered.
+ *   @return [void]
+ *
+ * @since 6.0.2
+ */
+static VALUE
+rb_grn_request_canceler_s_unregister (int argc, VALUE *argv, VALUE module)
+{
+    VALUE rb_request_id;
+    VALUE rb_options;
+    VALUE rb_context;
+    const char *request_id;
+    unsigned int request_id_size;
+    grn_ctx *context;
+
+    rb_scan_args(argc, argv, "11", &rb_request_id, &rb_options);
+    rb_grn_scan_options(rb_options,
+                        "context", &rb_context,
+                        NULL);
+    context = rb_grn_context_ensure(&rb_context);
+
+    request_id = StringValuePtr(rb_request_id);
+    request_id_size = RSTRING_LEN(rb_request_id);
+    grn_request_canceler_unregister(context, request_id, request_id_size);
+
+    return Qnil;
+}
+
+/*
+ * Cancels the specified request.
+ *
+ * @example Cancels a request by ID
+ *   request_id = "request-29"
+ *   Groonga::RequestCanceler.cancel(request_id)
+ *
+ * @overload cancel(request_id)
+ *   @param request_id [String] The ID of request to be canceled.
+ *   @return [Boolean] `true` if the request is canceled, `false` otherwise.
+ *
+ * @since 6.0.2
+ */
+static VALUE
+rb_grn_request_canceler_s_cancel (VALUE module, VALUE rb_request_id)
+{
+    const char *request_id;
+    unsigned int request_id_size;
+    grn_bool canceled;
+
+    request_id = StringValuePtr(rb_request_id);
+    request_id_size = RSTRING_LEN(rb_request_id);
+    canceled = grn_request_canceler_cancel(request_id, request_id_size);
+
+    return CBOOL2RVAL(canceled);
+}
+
+/*
+ * Cancels all running requests.
+ *
+ * @example Cancels all requests
+ *   Groonga::RequestCanceler.cancel_all
+ *
+ * @overload cancel_all
+ *   @return [Boolean] `true` if one or more requests are canceled,
+ *     `false` otherwise.
+ *
+ * @since 6.0.2
+ */
+static VALUE
+rb_grn_request_canceler_s_cancel_all (VALUE module)
+{
+    grn_bool canceled;
+
+    canceled = grn_request_canceler_cancel_all();
+
+    return CBOOL2RVAL(canceled);
+}
+
+void
+rb_grn_init_request_canceler (VALUE mGrn)
+{
+    rb_mGrnRequestCanceler = rb_define_module_under(mGrn, "RequestCanceler");
+
+    rb_define_singleton_method(rb_mGrnRequestCanceler, "register",
+                               rb_grn_request_canceler_s_register, -1);
+    rb_define_singleton_method(rb_mGrnRequestCanceler, "unregister",
+                               rb_grn_request_canceler_s_unregister, -1);
+    rb_define_singleton_method(rb_mGrnRequestCanceler, "cancel",
+                               rb_grn_request_canceler_s_cancel, 1);
+    rb_define_singleton_method(rb_mGrnRequestCanceler, "cancel_all",
+                               rb_grn_request_canceler_s_cancel_all, 0);
+}