rroonga 5.0.0-x86-mingw32 → 5.0.1-x86-mingw32

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

@@ -232,7 +232,7 @@ rb_grn_patricia_trie_s_create (int argc, VALUE *argv, VALUE klass)
     table = grn_table_create(context, name, name_size, path,
                              flags, key_type, value_type);
     if (!table)
-        rb_grn_context_check(context, rb_ary_new4(argc, argv));
+        rb_grn_context_check(context, rb_ary_new_from_values(argc, argv));
     rb_table = GRNOBJECT2RVAL(klass, context, table, GRN_TRUE);
 
     if (!NIL_P(rb_default_tokenizer))
@@ -306,6 +306,8 @@ rb_grn_patricia_trie_search (int argc, VALUE *argv, VALUE self)
     grn_bool search_options_is_set = GRN_FALSE;
     VALUE rb_key, options, rb_result, rb_operator, rb_type;
 
+    memset(&search_options, 0, sizeof(grn_search_optarg));
+
     rb_grn_table_key_support_deconstruct(SELF(self), &table, &context,
                                          &key, &domain_id, &domain,
                                          NULL, NULL, NULL,
@@ -422,11 +424,11 @@ rb_grn_patricia_trie_scan (VALUE self, VALUE rb_string)
             term = rb_grn_context_rb_string_new(context,
                                                 string + hits[i].offset,
                                                 hits[i].length);
-            matched_info = rb_ary_new3(4,
-                                       record,
-                                       term,
-                                       UINT2NUM(hits[i].offset),
-                                       UINT2NUM(hits[i].length));
+            matched_info = rb_ary_new_from_args(4,
+                                                record,
+                                                term,
+                                                UINT2NUM(hits[i].offset),
+                                                UINT2NUM(hits[i].length));
             if (block_given) {
                 rb_yield(matched_info);
             } else {
@@ -532,7 +534,7 @@ rb_grn_patricia_trie_open_grn_prefix_cursor (int argc, VALUE *argv, VALUE self,
     if (!NIL_P(rb_key_bytes) && !NIL_P(rb_key_bits)) {
         rb_raise(rb_eArgError,
                  "should not specify both :key_bytes and :key_bits once: %s",
-                 rb_grn_inspect(rb_ary_new4(argc, argv)));
+                 rb_grn_inspect(rb_ary_new_from_values(argc, argv)));
     } else if (!NIL_P(rb_key_bytes)) {
         prefix_size = NUM2UINT(rb_key_bytes);
     } else if (!NIL_P(rb_key_bits)) {
@@ -682,7 +684,7 @@ rb_grn_patricia_trie_open_grn_rk_cursor (int argc, VALUE *argv, VALUE self,
     if (!NIL_P(rb_key_bytes) && !NIL_P(rb_key_bits)) {
         rb_raise(rb_eArgError,
                  "should not specify both :key_bytes and :key_bits once: %s",
-                 rb_grn_inspect(rb_ary_new4(argc, argv)));
+                 rb_grn_inspect(rb_ary_new_from_values(argc, argv)));
     } else if (!NIL_P(rb_key_bytes)) {
         prefix_size = NUM2UINT(rb_key_bytes);
     } else if (!NIL_P(rb_key_bits)) {

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

@@ -117,7 +117,53 @@ rb_grn_plugin_s_register (int argc, VALUE *argv, VALUE klass)
         grn_plugin_register_by_path(context, path);
     }
 
-    rb_grn_context_check(context, rb_ary_new4(argc, argv));
+    rb_grn_context_check(context, rb_ary_new_from_values(argc, argv));
+    return Qnil;
+}
+
+/*
+ * Unregister a registered plugin.
+ *
+ * Unregister `name` plugin by name if `name` plugin is installed to
+ * plugin directory. You can also specify the path of `name` plugin
+ * explicitly.
+ *
+ * @example Unregister a registerd plugin by name.
+ *   Groonga::Plugin.register("token_filters/stop_word")
+ *   Groonga::Plugin.unregister("token_filters/stop_word")
+ * @example unregister a registerd plugin by path
+ *   Groonga::Plugin.register("token_filters/stop_word")
+ *   Groonga::Plugin.unregister("/usr/local/lib/groonga/plugins/token_filters/stop_word.so")
+ * @overload unregister(name, options={})
+ *   Unregister specified `name` plugin.
+ *   You can specify the path of plugin explicitly.
+ *   @param [String] name The name of plugin.
+ *   @param options [::Hash] The name and value pairs.
+ *   @option options :context (Groonga::Context.default)
+ *     The context which is bound to database.
+ */
+static VALUE
+rb_grn_plugin_s_unregister (int argc, VALUE *argv, VALUE klass)
+{
+    const char *name = NULL;
+    VALUE rb_options, rb_name = Qnil, rb_context;
+    grn_ctx *context;
+
+    rb_scan_args(argc, argv, "11", &rb_name, &rb_options);
+    rb_grn_scan_options(rb_options,
+                        "context", &rb_context,
+                        NULL);
+    rb_name = rb_grn_convert_to_string(rb_name);
+    name = StringValueCStr(rb_name);
+
+    if (NIL_P(rb_context)) {
+        rb_context = rb_grn_context_get_default();
+    }
+    context = RVAL2GRNCONTEXT(rb_context);
+
+    grn_plugin_unregister(context, name);
+
+    rb_grn_context_check(context, rb_ary_new_from_values(argc, argv));
     return Qnil;
 }
 
@@ -130,7 +176,7 @@ rb_grn_plugin_s_register (int argc, VALUE *argv, VALUE klass)
 static VALUE
 rb_grn_plugin_s_system_plugins_dir (VALUE klass)
 {
-    return rb_str_new2(grn_plugin_get_system_plugins_dir());
+    return rb_str_new_cstr(grn_plugin_get_system_plugins_dir());
 }
 
 /*
@@ -142,7 +188,7 @@ rb_grn_plugin_s_system_plugins_dir (VALUE klass)
 static VALUE
 rb_grn_plugin_s_suffix (VALUE klass)
 {
-    return rb_str_new2(grn_plugin_get_suffix());
+    return rb_str_new_cstr(grn_plugin_get_suffix());
 }
 
 void
@@ -153,6 +199,8 @@ rb_grn_init_plugin (VALUE mGrn)
 
     rb_define_singleton_method(cGrnPlugin, "register",
                                rb_grn_plugin_s_register, -1);
+    rb_define_singleton_method(cGrnPlugin, "unregister",
+                               rb_grn_plugin_s_unregister, -1);
     rb_define_singleton_method(cGrnPlugin, "system_plugins_dir",
                                rb_grn_plugin_s_system_plugins_dir, 0);
     rb_define_singleton_method(cGrnPlugin, "suffix",

data/ext/groonga/rb-grn-prefix-operator.c

@@ -0,0 +1,86 @@
+/* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+  Copyright (C) 2015  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"
+
+VALUE rb_cGrnPrefixOperator;
+
+/*
+ * Executes a prefix-search operation. Prefix-serach operation checks
+ * whether `text` starts with `prefix` or not.
+ *
+ * @example Executes prefix-search operations with the default context
+ *   Groonga::Operator::PREFIX.exec("Hello Rroonga", "Hello")   # => true
+ *   Groonga::Operator::PREFIX.exec("Hello Rroonga", "Rroonga") # => false
+ *
+ * @example Executes prefix-search operations with the specified context
+ *   context = Groonga::Context.new
+ *   Groonga::Operator::PREFIX.exec("Hello Rroonga", "Hello",
+ *                                  :context => context) # => true
+ *   Groonga::Operator::PREFIX.exec("Hello Rroonga", "Rroonga",
+ *                                  :context => context) # => false
+ *
+ * @overload exec(text, prefix, options={})
+ *   @param text [String] The text to be searched.
+ *   @param prefix [String] The prefix to be contained.
+ *   @param options [::Hash] The options.
+ *   @option options [Groonga::Context] (Groonga::Context.default)
+ *      The context to executes the operation.
+ *   @return [Boolean] `true` if `text` starts with `prefix`, `false`
+ *      otherwise.
+ */
+static VALUE
+rb_grn_prefix_operator_exec (int argc, VALUE *argv, VALUE self)
+{
+    grn_bool have_prefix;
+    VALUE rb_text;
+    VALUE rb_prefix;
+    VALUE rb_options;
+    VALUE rb_context;
+    grn_ctx *context;
+    grn_obj text;
+    grn_obj prefix;
+
+    rb_scan_args(argc, argv, "21", &rb_text, &rb_prefix, &rb_options);
+
+    rb_grn_scan_options(rb_options,
+                        "context", &rb_context,
+                        NULL);
+    context = rb_grn_context_ensure(&rb_context);
+
+    GRN_VOID_INIT(&text);
+    GRN_VOID_INIT(&prefix);
+    RVAL2GRNBULK(rb_text, context, &text);
+    RVAL2GRNBULK(rb_prefix, context, &prefix);
+    have_prefix = grn_operator_exec_prefix(context, &text, &prefix);
+    GRN_OBJ_FIN(context, &text);
+    GRN_OBJ_FIN(context, &prefix);
+
+    return CBOOL2RVAL(have_prefix);
+}
+
+void
+rb_grn_init_prefix_operator (VALUE mGrn)
+{
+    rb_cGrnPrefixOperator = rb_define_class_under(mGrn,
+                                                 "PrefixOperator",
+                                                 rb_cGrnOperator);
+
+    rb_define_method(rb_cGrnPrefixOperator, "exec",
+                     rb_grn_prefix_operator_exec, -1);
+}

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

@@ -37,4 +37,8 @@ rb_grn_init_procedure_type (VALUE mGrn)
                     "HOOK", INT2NUM(GRN_PROC_HOOK));
     rb_define_const(rb_mGrnProcedureType,
                     "NORMALIZER", INT2NUM(GRN_PROC_NORMALIZER));
+    rb_define_const(rb_mGrnProcedureType,
+                    "TOKEN_FILTER", INT2NUM(GRN_PROC_TOKEN_FILTER));
+    rb_define_const(rb_mGrnProcedureType,
+                    "SCORER", INT2NUM(GRN_PROC_SCORER));
 }

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

@@ -58,9 +58,9 @@ rb_grn_query_logger_log (grn_ctx *ctx, unsigned int flag,
     /* TODO: use rb_protect(). */
     rb_funcall(handler, id_log, 4,
                GRNQUERYLOGFLAGS2RVAL(flag),
-               rb_str_new2(timestamp),
-               rb_str_new2(info),
-               rb_str_new2(message));
+               rb_str_new_cstr(timestamp),
+               rb_str_new_cstr(info),
+               rb_str_new_cstr(message));
 }
 
 static void
@@ -234,7 +234,7 @@ rb_grn_query_logger_s_get_path (VALUE klass)
 
     path = grn_default_query_logger_get_path();
     if (path) {
-        rb_path = rb_str_new2(path);
+        rb_path = rb_str_new_cstr(path);
     }
     return rb_path;
 }

data/ext/groonga/rb-grn-regexp-operator.c

@@ -0,0 +1,85 @@
+/* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+  Copyright (C) 2015  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"
+
+VALUE rb_cGrnRegexpOperator;
+
+/*
+ * Executes a regular expression match operation.
+ *
+ * @example Executes regular expression match operations with the default context
+ *   Groonga::Operator::REGEXP.exec("Hello Rroonga", /Rro+nga/) # => true
+ *   Groonga::Operator::REGEXP.exec("Hello Rroonga", /Gro+nga/) # => false
+ *
+ * @example Executes regular expression match operations with the specified context
+ *   context = Groonga::Context.new
+ *   Groonga::Operator::REGEXP.exec("Hello Rroonga", /Rro+nga/,
+ *                                :context => context) # => true
+ *   Groonga::Operator::REGEXP.exec("Hello Rroonga", /Gro+nga/,
+ *                                :context => context) # => false
+ *
+ * @overload exec(text, regexp, options={})
+ *   @param text [String] The text to be matched.
+ *   @param regexp [Regexp] The regular expression.
+ *   @param options [::Hash] The options.
+ *   @option options [Groonga::Context] (Groonga::Context.default)
+ *      The context to executes the operation.
+ *   @return [Boolean] `true` if `text` matches `regexp`, `false`
+ *      otherwise.
+ */
+static VALUE
+rb_grn_regexp_operator_exec (int argc, VALUE *argv, VALUE self)
+{
+    grn_bool matched;
+    VALUE rb_text;
+    VALUE rb_regexp;
+    VALUE rb_options;
+    VALUE rb_context;
+    grn_ctx *context;
+    grn_obj text;
+    grn_obj regexp;
+
+    rb_scan_args(argc, argv, "21", &rb_text, &rb_regexp, &rb_options);
+
+    rb_grn_scan_options(rb_options,
+                        "context", &rb_context,
+                        NULL);
+    context = rb_grn_context_ensure(&rb_context);
+
+    GRN_VOID_INIT(&text);
+    GRN_VOID_INIT(&regexp);
+    RVAL2GRNBULK(rb_text, context, &text);
+    RVAL2GRNBULK(rb_regexp, context, &regexp);
+    matched = grn_operator_exec_regexp(context, &text, &regexp);
+    GRN_OBJ_FIN(context, &text);
+    GRN_OBJ_FIN(context, &regexp);
+
+    return CBOOL2RVAL(matched);
+}
+
+void
+rb_grn_init_regexp_operator (VALUE mGrn)
+{
+    rb_cGrnRegexpOperator = rb_define_class_under(mGrn,
+                                                 "RegexpOperator",
+                                                 rb_cGrnOperator);
+
+    rb_define_method(rb_cGrnRegexpOperator, "exec",
+                     rb_grn_regexp_operator_exec, -1);
+}

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

@@ -146,7 +146,7 @@ rb_grn_snippet_initialize (int argc, VALUE *argv, VALUE self)
                             default_open_tag, default_open_tag_length,
                             default_close_tag, default_close_tag_length,
                             mapping);
-    rb_grn_context_check(context, rb_ary_new4(argc, argv));
+    rb_grn_context_check(context, rb_ary_new_from_values(argc, argv));
 
     rb_grn_object_assign(Qnil, self, rb_context, context, snippet);
     rb_grn_context_register_floating_object(DATA_PTR(self));

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

@@ -196,7 +196,7 @@ rb_grn_table_key_support_inspect (VALUE self)
 {
     VALUE inspected;
 
-    inspected = rb_str_new2("");
+    inspected = rb_str_new_cstr("");
     rb_grn_object_inspect_header(self, inspected);
     rb_grn_object_inspect_content(self, inspected);
     rb_grn_table_inspect_content(self, inspected);
@@ -525,7 +525,9 @@ rb_grn_table_key_support_array_set (VALUE self, VALUE rb_key, VALUE rb_values)
     if (id == GRN_ID_NIL) {
         rb_raise(rb_eGrnError,
                  "failed to add record: %s",
-                 rb_grn_inspect(rb_ary_new3(3, self, rb_key, rb_values)));
+                 rb_grn_inspect(rb_ary_new_from_args(3,
+                                                     self,
+                                                     rb_key, rb_values)));
     }
 
     data.self = self;
@@ -568,9 +570,11 @@ rb_grn_table_key_support_set_column_value (int argc, VALUE *argv, VALUE self)
     if (id == GRN_ID_NIL) {
         rb_raise(rb_eGrnError,
                  "failed to add record: %s",
-                 rb_grn_inspect(rb_ary_new3(4,
-                                            self, rb_key,
-                                            rb_name, rb_value)));
+                 rb_grn_inspect(rb_ary_new_from_args(4,
+                                                     self,
+                                                     rb_key,
+                                                     rb_name,
+                                                     rb_value)));
     }
 
     return rb_grn_table_set_column_value_raw(self, id, rb_name, rb_value);

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

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
   Copyright (C) 2014-2015  Masafumi Yokoyama <yokoyama@clear-code.com>
-  Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2015  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
@@ -199,7 +199,7 @@ rb_grn_table_inspect (VALUE self)
 {
     VALUE inspected;
 
-    inspected = rb_str_new2("");
+    inspected = rb_str_new_cstr("");
     rb_grn_object_inspect_header(self, inspected);
     rb_grn_object_inspect_content(self, inspected);
     rb_grn_table_inspect_content(self, inspected);
@@ -238,7 +238,7 @@ rb_grn_table_inspect (VALUE self)
  *     - +:zlib+ := 値をzlib圧縮して格納する。
  *     - +:lz4+ := 値をLZ4圧縮して格納する。
  *
- * @return [Groonga::FixSizeColumn or Groonga::VariableSizeColumn]
+ * @return [Groonga::FixSizeColumn, Groonga::VariableSizeColumn]
  */
 static VALUE
 rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
@@ -328,8 +328,12 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
     column = grn_column_create(context, table, name, name_size,
                                path, flags, value_type);
     if (context->rc) {
-        rb_grn_context_check(context,
-                             rb_ary_new3(2, self, rb_ary_new4(argc, argv)));
+        VALUE rb_related_object;
+        rb_related_object =
+            rb_ary_new_from_args(2,
+                                 self,
+                                 rb_ary_new_from_values(argc, argv));
+        rb_grn_context_check(context, rb_related_object);
     }
 
     rb_column = GRNCOLUMN2RVAL(Qnil, context, column, GRN_TRUE);
@@ -451,8 +455,10 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self)
     column = grn_column_create(context, table, name, name_size,
                                path, flags, value_type);
     if (context->rc) {
-        rb_grn_context_check(context,
-                             rb_ary_new3(2, self, rb_ary_new4(argc, argv)));
+        VALUE rb_related_object;
+        rb_related_object =
+            rb_ary_new_from_args(2, self, rb_ary_new_from_values(argc, argv));
+        rb_grn_context_check(context, rb_related_object);
     }
 
     rb_column = GRNCOLUMN2RVAL(Qnil, context, column, GRN_TRUE);
@@ -494,7 +500,7 @@ ruby_object_to_column_name (VALUE rb_name,
  * い場合は +nil+ を返す。
  *
  * @overload column(name)
- *   @return [Groonga::Column or nil]
+ *   @return [Groonga::Column, nil]
  */
 VALUE
 rb_grn_table_get_column (VALUE self, VALUE rb_name)
@@ -1338,7 +1344,7 @@ rb_grn_table_sort (int argc, VALUE *argv, VALUE self)
  *     @option options :max_n_sub_records
  *       グループ化した後のレコードのそれぞれについて最大 _:max_n_sub_records_ 件まで
  *       そのグループに含まれる _table_ のレコードをサブレコードとして格納する。
- *     @option options [String or Symbol] :calc_target
+ *     @option options [String, Symbol] :calc_target
  *       The target column name for _:calc_types_.
  *     @option options [::Array] :calc_types
  *       It specifies how to calculate (aggregate) values in grouped records by
@@ -1584,10 +1590,14 @@ rb_grn_table_get_value_convenience (int argc, VALUE *argv, VALUE self)
                             "id", &rb_option_id,
                             NULL);
         if (!(NIL_P(rb_option_id) || RVAL2CBOOL(rb_option_id))) {
+            VALUE rb_related_object;
+            rb_related_object =
+                rb_ary_new_from_args(2,
+                                     self,
+                                     rb_ary_new_from_values(argc, argv));
             rb_raise(rb_eArgError, ":id options must be true or nil: %s: %s",
                      rb_grn_inspect(rb_option_id),
-                     rb_grn_inspect(rb_ary_new3(2,
-                                                self, rb_ary_new4(argc, argv))));
+                     rb_grn_inspect(rb_related_object));
         }
     }
 
@@ -1642,10 +1652,14 @@ rb_grn_table_set_value_convenience (int argc, VALUE *argv, VALUE self)
                             "id", &rb_option_id,
                             NULL);
         if (!(NIL_P(rb_option_id) || RVAL2CBOOL(rb_option_id))) {
+            VALUE rb_related_object;
+            rb_related_object =
+                rb_ary_new_from_args(2,
+                                     self,
+                                     rb_ary_new_from_values(argc, argv));
             rb_raise(rb_eArgError, ":id options must be true or nil: %s: %s",
                      rb_grn_inspect(rb_option_id),
-                     rb_grn_inspect(rb_ary_new3(2,
-                                                self, rb_ary_new4(argc, argv))));
+                     rb_grn_inspect(rb_related_object));
         }
     }
 
@@ -1693,11 +1707,14 @@ rb_grn_table_get_column_value_convenience (int argc, VALUE *argv, VALUE self)
                             "id", &rb_option_id,
                             NULL);
         if (!(NIL_P(rb_option_id) || RVAL2CBOOL(rb_option_id))) {
+            VALUE rb_related_object;
+            rb_related_object =
+                rb_ary_new_from_args(2,
+                                     self,
+                                     rb_ary_new_from_values(argc, argv));
             rb_raise(rb_eArgError, ":id options must be true or nil: %s: %s",
                      rb_grn_inspect(rb_option_id),
-                     rb_grn_inspect(rb_ary_new3(2,
-                                                self,
-                                                rb_ary_new4(argc, argv))));
+                     rb_grn_inspect(rb_related_object));
         }
     }
 
@@ -1733,7 +1750,7 @@ rb_grn_table_set_column_value (VALUE self, VALUE rb_id,
  * @overload set_column_value(id, name, value)
  *   @!macro [new] table.set_column_value.base_arguments
  *     @param id [Integer] The ID of the target record.
- *     @param name [String or Symbol] The name of the target column.
+ *     @param name [String, Symbol] The name of the target column.
  *   @!macro [new] table.set_column_value.value
  *     @param value [::Object] The new value.
  *
@@ -1894,11 +1911,14 @@ rb_grn_table_set_column_value_convenience (int argc, VALUE *argv, VALUE self)
                             "id", &rb_option_id,
                             NULL);
         if (!(NIL_P(rb_option_id) || RVAL2CBOOL(rb_option_id))) {
+            VALUE rb_related_object;
+            rb_related_object =
+                rb_ary_new_from_args(2,
+                                     self,
+                                     rb_ary_new_from_values(argc, argv));
             rb_raise(rb_eArgError, ":id options must be true or nil: %s: %s",
                      rb_grn_inspect(rb_option_id),
-                     rb_grn_inspect(rb_ary_new3(2,
-                                                self,
-                                                rb_ary_new4(argc, argv))));
+                     rb_grn_inspect(rb_related_object));
         }
     }
 
@@ -2019,78 +2039,44 @@ rb_grn_table_lock (int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * _table_ のロックを強制的に解除する。
+ * Forces to clear lock of the `table`.
  *
- * @overload clear_lock(options={})
- *   @param [::Hash] options The name and value
- *     pairs. Omitted names are initialized as the default value.
- *   @option options :id
- *     _:id_ で指定したレコードのロックを強制的に解除する。
- *     （注: groonga側が未実装のため、現在は無視される。実装さ
- *     れるのではないかと思っているが、実装されないかもしれな
- *     い。）
+ * @overload clear_lock
+ *   @return [void]
  */
 static VALUE
-rb_grn_table_clear_lock (int argc, VALUE *argv, VALUE self)
+rb_grn_table_clear_lock (VALUE self)
 {
-    grn_id id = GRN_ID_NIL;
     grn_ctx *context;
     grn_obj *table;
-    VALUE options, rb_id;
-
-    rb_scan_args(argc, argv, "01",  &options);
 
     rb_grn_table_deconstruct(SELF(self), &table, &context,
                              NULL, NULL,
                              NULL, NULL, NULL,
                              NULL);
 
-    rb_grn_scan_options(options,
-                        "id", &rb_id,
-                        NULL);
-
-    if (!NIL_P(rb_id))
-        id = NUM2UINT(rb_id);
-
     grn_obj_clear_lock(context, table);
 
     return Qnil;
 }
 
 /*
- * _table_ がロックされていれば +true+ を返す。
+ * Checks whether the `table` is locked or not.
  *
- * @overload locked?(options={})
- *   @param [options] options The name and value
- *     pairs. Omitted names are initialized as the default value.
- *   @option options :id
- *     _:id_ で指定したレコードがロックされていれば +true+ を返す。
- *     （注: groonga側が未実装のため、現在は無視される。実装さ
- *     れるのではないかと思っているが、実装されないかもしれな
- *     い。）
+ * @overload locked?
+ *   @return [Boolean] `true` if the `table` is locked, `false` otherwise.
  */
 static VALUE
-rb_grn_table_is_locked (int argc, VALUE *argv, VALUE self)
+rb_grn_table_locked_p (VALUE self)
 {
-    grn_id id = GRN_ID_NIL;
     grn_ctx *context;
     grn_obj *table;
-    VALUE options, rb_id;
-
-    rb_scan_args(argc, argv, "01",  &options);
 
     rb_grn_table_deconstruct(SELF(self), &table, &context,
                              NULL, NULL,
                              NULL, NULL, NULL,
                              NULL);
 
-    rb_grn_scan_options(options,
-                        "id", &rb_id,
-                        NULL);
-
-    if (!NIL_P(rb_id))
-        id = NUM2UINT(rb_id);
-
     return CBOOL2RVAL(grn_obj_is_locked(context, table));
 }
 
@@ -2257,7 +2243,7 @@ rb_grn_table_select (int argc, VALUE *argv, VALUE self)
                      "should be [query_string, option_hash], "
                      "[expression, option_hash] "
                      "or [option_hash]: %s",
-                     rb_grn_inspect(rb_ary_new4(argc, argv)));
+                     rb_grn_inspect(rb_ary_new_from_values(argc, argv)));
         options = condition_or_options;
     }
 
@@ -2285,7 +2271,7 @@ rb_grn_table_select (int argc, VALUE *argv, VALUE self)
         if (!result) {
             rb_raise(rb_eGrnNoMemoryAvailable,
                      "failed to create result table: %s",
-                     rb_grn_inspect(rb_ary_new4(argc, argv)));
+                     rb_grn_inspect(rb_ary_new_from_values(argc, argv)));
         }
         rb_result = GRNTABLE2RVAL(context, result, GRN_TRUE);
     } else {
@@ -2631,8 +2617,8 @@ rb_grn_init_table (VALUE mGrn)
 
     rb_define_method(rb_cGrnTable, "lock", rb_grn_table_lock, -1);
     rb_define_method(rb_cGrnTable, "unlock", rb_grn_table_unlock, -1);
-    rb_define_method(rb_cGrnTable, "clear_lock", rb_grn_table_clear_lock, -1);
-    rb_define_method(rb_cGrnTable, "locked?", rb_grn_table_is_locked, -1);
+    rb_define_method(rb_cGrnTable, "clear_lock", rb_grn_table_clear_lock, 0);
+    rb_define_method(rb_cGrnTable, "locked?", rb_grn_table_locked_p, 0);
 
     rb_define_method(rb_cGrnTable, "select", rb_grn_table_select, -1);