rroonga 9.0.3 → 11.0.0

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

@@ -1,8 +1,8 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* vim: set sts=4 sw=4 ts=8 noet: */
 /*
+  Copyright (C) 2011-2021  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
-  Copyright (C) 2011-2014  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
@@ -20,7 +20,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnDoubleArrayTrie *)DATA_PTR(object))
+#define SELF(object) ((RbGrnDoubleArrayTrie *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnDoubleArrayTrie;
 

data/ext/groonga/rb-grn-encoding-support.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2015  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2021  Sutou Kouhei <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
@@ -18,7 +18,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) (RB_GRN_OBJECT(DATA_PTR(object)))
+#define SELF(object) (RB_GRN_OBJECT(RTYPEDDATA_DATA(object)))
 
 VALUE rb_mGrnEncodingSupport;
 

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

@@ -103,6 +103,7 @@ static VALUE eGrnScorerError;
 static VALUE eGrnCancel;
 static VALUE eGrnWindowFunctionError;
 static VALUE eGrnZstdError;
+static VALUE eGrnConnectionReset;
 
 VALUE
 rb_grn_rc_to_exception (grn_rc rc)
@@ -353,6 +354,9 @@ rb_grn_rc_to_exception (grn_rc rc)
       case GRN_ZSTD_ERROR:
         exception = eGrnZstdError;
         break;
+      case GRN_CONNECTION_RESET:
+        exception = eGrnConnectionReset;
+        break;
     }
 
     if (NIL_P(exception))
@@ -1072,4 +1076,14 @@ rb_grn_init_exception (VALUE mGrn)
      */
     eGrnZstdError =
         rb_define_class_under(mGrn, "ZstdError", rb_eGrnError);
+
+    /*
+     * Document-class: Groonga::ConnectionReset
+     *
+     * It is used when connection is reset.
+     *
+     * @since 10.1.1
+     */
+    eGrnConnectionReset =
+        rb_define_class_under(mGrn, "ConnectionReset", rb_eGrnError);
 }

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2020  Sutou Kouhei <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
@@ -42,9 +42,9 @@ build (VALUE self)
 }
 
 static VALUE
-build_block (VALUE self)
+build_block (RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg))
 {
-    return rb_funcall(rb_block_proc(), rb_intern("call"), 1, self);
+    return rb_funcall(rb_block_proc(), rb_intern("call"), 1, yielded_arg);
 }
 
 VALUE

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2018  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2021  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 
   This library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnExpression *)DATA_PTR(object))
+#define SELF(object) ((RbGrnExpression *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnExpression;
 
@@ -100,7 +100,7 @@ rb_grn_expression_initialize (int argc, VALUE *argv, VALUE self)
     expression = grn_expr_create(context, name, name_size);
     rb_grn_context_check(context, self);
     rb_grn_object_assign(Qnil, self, rb_context, context, expression);
-    rb_grn_context_register_floating_object(DATA_PTR(self));
+    rb_grn_context_register_floating_object(RTYPEDDATA_DATA(self));
 
     rb_iv_set(self, "@objects", rb_ary_new());
 

data/ext/groonga/rb-grn-fix-size-column.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2021  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnColumn *)DATA_PTR(object))
+#define SELF(object) ((RbGrnColumn *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnFixSizeColumn;
 

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

@@ -1,6 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
   Copyright (C) 2015  Masafumi Yokoyama <yokoyama@clear-code.com>
+  Copyright (C) 2021  Sutou Kouhei <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
@@ -18,7 +19,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) (RB_GRN_OBJECT(DATA_PTR(object)))
+#define SELF(object) (RB_GRN_OBJECT(RTYPEDDATA_DATA(object)))
 
 VALUE rb_mGrnFlushable;
 
@@ -43,15 +44,20 @@ rb_grn_flushable_flush (int argc, VALUE *argv, VALUE self)
     grn_ctx *context = NULL;
     grn_obj *object = NULL;
     VALUE rb_recursive_p;
+    VALUE rb_dependent_p;
     VALUE rb_options;
 
     rb_scan_args(argc, argv, "01", &rb_options);
     rb_grn_scan_options(rb_options,
                         "recursive", &rb_recursive_p,
+                        "dependent", &rb_dependent_p,
                         NULL);
     if (NIL_P(rb_recursive_p)) {
         rb_recursive_p = Qtrue;
     }
+    if (NIL_P(rb_dependent_p)) {
+        rb_dependent_p = Qfalse;
+    }
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -63,6 +69,8 @@ rb_grn_flushable_flush (int argc, VALUE *argv, VALUE self)
 
     if (RVAL2CBOOL(rb_recursive_p)) {
         grn_obj_flush_recursive(context, object);
+    } else if (RVAL2CBOOL(rb_dependent_p)) {
+        grn_obj_flush_recursive_dependent(context, object);
     } else {
         grn_obj_flush(context, 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-2016  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2021  Sutou Kouhei <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
@@ -18,7 +18,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnTableKeySupport *)DATA_PTR(object))
+#define SELF(object) ((RbGrnTableKeySupport *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnHash;
 

data/ext/groonga/rb-grn-index-column.c

@@ -1,7 +1,8 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2017  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2021  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 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
@@ -21,7 +22,7 @@
 
 #include <string.h>
 
-#define SELF(object) ((RbGrnIndexColumn *)DATA_PTR(object))
+#define SELF(object) ((RbGrnIndexColumn *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnIndexColumn;
 
@@ -972,6 +973,31 @@ rb_grn_index_column_medium_p (VALUE self)
     return CBOOL2RVAL(flags & GRN_OBJ_INDEX_MEDIUM);
 }
 
+/*
+ * Checks whether the index column is large or not.
+ *
+ * @overload large?
+ *   @return [Boolean] `true` if the index column size is large,
+ *     `false` otherwise.
+ *
+ * @since 9.0.4
+ */
+static VALUE
+rb_grn_index_column_large_p (VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_index_column_deconstruct(SELF(self), &column, &context,
+                                    NULL, NULL,
+                                    NULL, NULL, NULL, NULL, NULL,
+                                    NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL(flags & GRN_OBJ_INDEX_LARGE);
+}
+
 static VALUE
 call_close (VALUE object)
 {
@@ -1442,6 +1468,8 @@ rb_grn_init_index_column (VALUE mGrn)
                      rb_grn_index_column_small_p, 0);
     rb_define_method(rb_cGrnIndexColumn, "medium?",
                      rb_grn_index_column_medium_p, 0);
+    rb_define_method(rb_cGrnIndexColumn, "large?",
+                     rb_grn_index_column_large_p, 0);
 
     rb_define_method(rb_cGrnIndexColumn, "open_cursor",
                      rb_grn_index_column_open_cursor, -1);

data/ext/groonga/rb-grn-index-cursor.c

@@ -1,7 +1,8 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
   Copyright (C) 2011  Haruka Yoshihara <yoshihara@clear-code.com>
-  Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2012-2021  Sutou Kouhei <kou@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
@@ -19,7 +20,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnIndexCursor *)DATA_PTR(object))
+#define SELF(object) ((RbGrnIndexCursor *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnIndexCursor;
 
@@ -56,6 +57,19 @@ rb_grn_index_cursor_deconstruct (RbGrnIndexCursor *rb_grn_index_cursor,
                               range_id, range);
 }
 
+static VALUE
+rb_grn_index_cursor_s_set_min_p (VALUE klass)
+{
+    return CBOOL2RVAL(grn_ii_cursor_set_min_enable_get());
+}
+
+static VALUE
+rb_grn_index_cursor_s_set_min_set (VALUE klass, VALUE enable)
+{
+    grn_ii_cursor_set_min_enable_set(RVAL2CBOOL(enable));
+    return enable;
+}
+
 static VALUE
 next_value (VALUE rb_posting,
             grn_ctx *context, grn_obj *cursor, VALUE rb_table, VALUE rb_lexicon)
@@ -158,6 +172,11 @@ rb_grn_init_index_cursor (VALUE mGrn)
     rb_define_alloc_func(rb_cGrnIndexCursor, rb_grn_object_alloc);
     rb_include_module(rb_cGrnIndexCursor, rb_mEnumerable);
 
+    rb_define_singleton_method(rb_cGrnIndexCursor, "set_min?",
+                               rb_grn_index_cursor_s_set_min_p, 0);
+    rb_define_singleton_method(rb_cGrnIndexCursor, "set_min=",
+                               rb_grn_index_cursor_s_set_min_set, 1);
+
     rb_define_method(rb_cGrnIndexCursor, "next", rb_grn_index_cursor_next, 0);
     rb_define_method(rb_cGrnIndexCursor, "each", rb_grn_index_cursor_each, -1);
 }

data/ext/groonga/rb-grn-inverted-index-cursor.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2017  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2017-2021  Sutou Kouhei <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
@@ -18,7 +18,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnInvertedIndexCursor *)DATA_PTR(object))
+#define SELF(object) ((RbGrnInvertedIndexCursor *)RTYPEDDATA_DATA(object))
 
 typedef struct _RbGrnInvertedIndexCursor RbGrnInvertedIndexCursor;
 struct _RbGrnInvertedIndexCursor
@@ -255,7 +255,7 @@ void
 rb_grn_init_inverted_index_cursor (VALUE mGrn)
 {
     rb_cGrnInvertedIndexCursor =
-      rb_define_class_under(mGrn, "InvertedIndexCursor", rb_cData);
+      rb_define_class_under(mGrn, "InvertedIndexCursor", rb_cObject);
     rb_include_module(rb_cGrnInvertedIndexCursor, rb_mEnumerable);
 
     rb_define_method(rb_cGrnInvertedIndexCursor, "next",

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

@@ -2,6 +2,7 @@
 /*
   Copyright (C) 2009-2015  Kouhei Sutou <kou@clear-code.com>
   Copyright (C) 2016-2017  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
@@ -315,15 +316,23 @@ rb_grn_logger_fin (grn_ctx *ctx, void *user_data)
  *     ログの発生元のプロセスIDとgroongaのソースコードのファイ
  *     ル名、行番号、関数名をブロックに渡したいなら +true+ を指
  *     定する。デフォルトでは渡す。
+ *   @option options [Bool] :thread_id (true)
+ *     Specifies whether `location` includes thread ID or not.
  */
 static VALUE
 rb_grn_logger_s_register (int argc, VALUE *argv, VALUE klass)
 {
     VALUE rb_context = Qnil;
     grn_ctx *context;
-    VALUE rb_logger, rb_callback;
-    VALUE rb_options, rb_max_level;
-    VALUE rb_time, rb_title, rb_message, rb_location;
+    VALUE rb_logger;
+    VALUE rb_callback;
+    VALUE rb_options;
+    VALUE rb_max_level;
+    VALUE rb_time;
+    VALUE rb_title;
+    VALUE rb_message;
+    VALUE rb_location;
+    VALUE rb_thread_id;
     VALUE rb_flags;
     grn_log_level max_level = GRN_LOG_DEFAULT_LEVEL;
     int flags = 0;
@@ -343,6 +352,7 @@ rb_grn_logger_s_register (int argc, VALUE *argv, VALUE klass)
                         "title",     &rb_title,
                         "message",   &rb_message,
                         "location",  &rb_location,
+                        "thread_id", &rb_thread_id,
                         "flags",     &rb_flags,
                         NULL);
     if (!NIL_P(rb_max_level)) {
@@ -361,6 +371,9 @@ rb_grn_logger_s_register (int argc, VALUE *argv, VALUE klass)
     if (NIL_P(rb_location) || CBOOL2RVAL(rb_location)) {
         flags |= GRN_LOG_LOCATION;
     }
+    if (NIL_P(rb_thread_id) || CBOOL2RVAL(rb_thread_id)) {
+        flags |= GRN_LOG_THREAD_ID;
+    }
     if (!NIL_P(rb_flags)) {
         flags = rb_funcall(rb_mGrnLoggerFlags, id_parse, 2,
                            INT2NUM(flags), rb_flags);
@@ -693,6 +706,7 @@ rb_grn_init_logger (VALUE mGrn)
     DEFINE_FLAG(MESSAGE);
     DEFINE_FLAG(LOCATION);
     DEFINE_FLAG(PID);
+    DEFINE_FLAG(THREAD_ID);
 #undef DEFINE_FLAG
 
     rb_cGrnCallbackLogger =

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

@@ -1,7 +1,8 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2018  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2021  Sutou Kouhei <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
@@ -27,10 +28,28 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnObject *)DATA_PTR(object))
+#define SELF(object) ((RbGrnObject *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnObject;
 
+static void
+rb_grn_object_dfree (void *pointer)
+{
+    rb_grn_object_free(pointer);
+}
+
+rb_data_type_t rb_grn_object_data_type = {
+    "Groonga::Object",
+    {
+        NULL,
+        rb_grn_object_dfree,
+        NULL,
+    },
+    NULL,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 grn_obj *
 rb_grn_object_from_ruby_object (VALUE object, grn_ctx **context)
 {
@@ -72,7 +91,10 @@ rb_grn_object_from_ruby_object (VALUE object, grn_ctx **context)
                  rb_grn_inspect(object));
     }
 
-    Data_Get_Struct(object, RbGrnObject, rb_grn_object);
+    TypedData_Get_Struct(object,
+                         RbGrnObject,
+                         &rb_grn_object_data_type,
+                         rb_grn_object);
     if (!rb_grn_object)
         rb_raise(rb_eGrnError, "Groonga object is NULL");
 
@@ -349,7 +371,9 @@ rb_grn_object_to_ruby_object (VALUE klass, grn_ctx *context, grn_obj *object,
 VALUE
 rb_grn_object_alloc (VALUE klass)
 {
-    return Data_Wrap_Struct(klass, NULL, rb_grn_object_free, NULL);
+    return TypedData_Wrap_Struct(klass,
+                                 &rb_grn_object_data_type,
+                                 NULL);
 }
 
 static void
@@ -358,15 +382,13 @@ rb_grn_object_bind_common (VALUE klass, VALUE self, VALUE rb_context,
                            grn_ctx *context, grn_obj *object)
 {
     grn_user_data *user_data;
-    RbGrnContext *rb_grn_context;
 
     debug("bind: %p:%p:%p %s(%#x)\n",
           context, object, rb_grn_object,
           grn_obj_type_to_string(object->header.type),
           object->header.type);
 
-    Data_Get_Struct(rb_context, RbGrnContext, rb_grn_context);
-    rb_grn_object->rb_grn_context = rb_grn_context;
+    rb_grn_object->rb_grn_context = rb_grn_context_get_struct(rb_context);
     rb_grn_object->context = context;
     rb_grn_object->object = object;
     rb_grn_object->self = self;
@@ -418,7 +440,7 @@ rb_grn_object_bind_common (VALUE klass, VALUE self, VALUE rb_context,
     else
         rb_grn_object->range = grn_ctx_at(context, rb_grn_object->range_id);
 
-    DATA_PTR(self) = rb_grn_object;
+    RTYPEDDATA_DATA(self) = rb_grn_object;
 }
 
 void
@@ -939,6 +961,8 @@ rb_grn_object_inspect_content_flags_with_label (VALUE inspected,
             rb_ary_push(inspected_flags, rb_str_new_cstr("SMALL"));
         if (column_flags & GRN_OBJ_INDEX_MEDIUM)
             rb_ary_push(inspected_flags, rb_str_new_cstr("MEDIUM"));
+        if (column_flags & GRN_OBJ_INDEX_LARGE)
+            rb_ary_push(inspected_flags, rb_str_new_cstr("LARGE"));
         break;
     default:
         break;
@@ -1355,7 +1379,7 @@ rb_grn_object_array_reference (VALUE self, VALUE rb_id)
     return rb_value;
 }
 
-static grn_bool
+static bool
 rb_uvector_value_p (RbGrnObject *rb_grn_object, VALUE rb_value)
 {
     VALUE first_element;
@@ -1363,7 +1387,7 @@ rb_uvector_value_p (RbGrnObject *rb_grn_object, VALUE rb_value)
     switch (rb_grn_object->range->header.type) {
       case GRN_TYPE:
         if (!(rb_grn_object->range->header.flags & GRN_OBJ_KEY_VAR_SIZE)) {
-            return GRN_TRUE;
+            return true;
         }
         break;
       case GRN_TABLE_HASH_KEY:
@@ -1379,7 +1403,7 @@ rb_uvector_value_p (RbGrnObject *rb_grn_object, VALUE rb_value)
         break;
     }
 
-    return GRN_FALSE;
+    return false;
 }
 
 typedef struct {
@@ -1527,7 +1551,7 @@ rb_grn_object_remove (int argc, VALUE *argv, VALUE self)
     grn_ctx *context;
     VALUE rb_options;
     VALUE rb_dependent_p;
-    grn_bool dependent_p = GRN_FALSE;
+    bool dependent_p = false;
 
     rb_grn_object = SELF(self);
     if (!rb_grn_object->object)
@@ -1560,7 +1584,7 @@ rb_grn_object_builtin_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool builtin = GRN_FALSE;
+    bool builtin = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1585,7 +1609,7 @@ rb_grn_object_table_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool table_p = GRN_FALSE;
+    bool table_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1610,7 +1634,7 @@ rb_grn_object_column_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool column_p = GRN_FALSE;
+    bool column_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1636,7 +1660,7 @@ rb_grn_object_reference_column_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool reference_column_p = GRN_FALSE;
+    bool reference_column_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1662,7 +1686,7 @@ rb_grn_object_index_column_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool index_column_p = GRN_FALSE;
+    bool index_column_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1687,7 +1711,7 @@ rb_grn_object_procedure_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool procedure_p = GRN_FALSE;
+    bool procedure_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1713,7 +1737,7 @@ rb_grn_object_function_procedure_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool function_procedure_p = GRN_FALSE;
+    bool function_procedure_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1739,7 +1763,7 @@ rb_grn_object_selector_procedure_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool selector_procedure_p = GRN_FALSE;
+    bool selector_procedure_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1765,7 +1789,7 @@ rb_grn_object_selector_only_procedure_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool selector_only_procedure_p = GRN_FALSE;
+    bool selector_only_procedure_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1791,7 +1815,7 @@ rb_grn_object_scorer_procedure_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool scorer_procedure_p = GRN_FALSE;
+    bool scorer_procedure_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1817,7 +1841,7 @@ rb_grn_object_window_function_procedure_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool window_function_procedure_p = GRN_FALSE;
+    bool window_function_procedure_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1844,7 +1868,7 @@ rb_grn_object_accessor_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool accessor_p = GRN_FALSE;
+    bool accessor_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1857,7 +1881,7 @@ rb_grn_object_accessor_p (VALUE self)
 }
 
 /*
- * Checks whether the object is key accessor or not.
+ * Checks whether the object is an accessor for `_key` or not.
  *
  * @example `true` case: `column("_key")` is an accessor and it's an accessor for `_key`
  *   Groonga::Schema.create_table("Users", :key_type => :short_text)
@@ -1880,7 +1904,7 @@ rb_grn_object_key_accessor_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool key_accessor_p = GRN_FALSE;
+    bool key_accessor_p = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
@@ -1892,6 +1916,153 @@ rb_grn_object_key_accessor_p (VALUE self)
     return CBOOL2RVAL(key_accessor_p);
 }
 
+/*
+ * Checks whether the object is an accessor for `_id` or not.
+ *
+ * @example `true` case: `column("_id")` is an accessor and it's an accessor for `_id`
+ *   Groonga::Schema.create_table("Users", :key_type => :short_text)
+ *   users = Groonga["Users"]
+ *   users.column("_id").id_accessor? # => true
+ *
+ * @example `false` case: `column("_key")` is an accessor but it's not an accessor for `_id`
+ *   Groonga::Schema.create_table("Users", :key_type => :short_text)
+ *   users = Groonga["Users"]
+ *   users.column("_key").id_accessor? # => false
+ *
+ * @overload id_accessor?
+ *   @return [Boolean] `true` if the object is an accessor for `_id`,
+ *     `false` otherwise.
+ *
+ * @since 9.0.4
+ */
+static VALUE
+rb_grn_object_id_accessor_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    bool id_accessor_p = false;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+
+    if (context && object) {
+        id_accessor_p = grn_obj_is_id_accessor(context, object);
+    }
+
+    return CBOOL2RVAL(id_accessor_p);
+}
+
+/*
+ * Checks whether the object is an accessor for `_value` or not.
+ *
+ * @example `true` case: `column("_value")` is an accessor and it's an accessor for `_value`
+ *   Groonga::Schema.create_table("Users",
+ *                                :key_type => :short_text,
+ *                                :value_type => "UInt32")
+ *   users = Groonga["Users"]
+ *   users.column("_value").value_accessor? # => true
+ *
+ * @example `false` case: `column("_key")` is an accessor but it's not an accessor for `_value`
+ *   Groonga::Schema.create_table("Users", :key_type => :short_text)
+ *   users = Groonga["Users"]
+ *   users.column("_key").value_accessor? # => false
+ *
+ * @overload value_accessor?
+ *   @return [Boolean] `true` if the object is an accessor for `_value`,
+ *     `false` otherwise.
+ *
+ * @since 9.0.4
+ */
+static VALUE
+rb_grn_object_value_accessor_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    bool value_accessor_p = false;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+
+    if (context && object) {
+        value_accessor_p = grn_obj_is_value_accessor(context, object);
+    }
+
+    return CBOOL2RVAL(value_accessor_p);
+}
+
+/*
+ * Checks whether the object is an accessor for `_socre` or not.
+ *
+ * @example `true` case: `column("_score")` is an accessor and it's an accessor for `_score`
+ *   Groonga::Schema.create_table("Users", :key_type => :short_text)
+ *   users = Groonga["Users"]
+ *   users.select.column("_score").socre_accessor? # => true
+ *
+ * @example `false` case: `column("_key")` is an accessor but it's not an accessor for `_score`
+ *   Groonga::Schema.create_table("Users", :key_type => :short_text)
+ *   users = Groonga["Users"]
+ *   users.column("_key").score_accessor? # => false
+ *
+ * @overload score_accessor?
+ *   @return [Boolean] `true` if the object is an accessor for `_score`,
+ *     `false` otherwise.
+ *
+ * @since 9.0.4
+ */
+static VALUE
+rb_grn_object_score_accessor_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    bool score_accessor_p = false;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+
+    if (context && object) {
+        score_accessor_p = grn_obj_is_score_accessor(context, object);
+    }
+
+    return CBOOL2RVAL(score_accessor_p);
+}
+
+/*
+ * Checks whether the object is an accessor for `_nsubrecs` or not.
+ *
+ * @example `true` case: `column("_nsubrecs")` is an accessor and it's an accessor for `_nsubrecs`
+ *   users = Groonga::Hash.create(:name => "Users",
+ *                                :key_type => "ShortText")
+ *   grouped_users = users.group("_key")
+ *   grouped_users.column("_nsubrecs").n_sub_records_accessor? # => true
+ *
+ * @example `false` case: `column("_key")` is an accessor but it's not an accessor for `_nsubrecs`
+ *   Groonga::Schema.create_table("Users", :key_type => :short_text)
+ *   users = Groonga["Users"]
+ *   users.column("_key").n_sub_records_accessor? # => false
+ *
+ * @overload n_sub_records_accessor?
+ *   @return [Boolean] `true` if the object is an accessor for `_nsubrecs`,
+ *     `false` otherwise.
+ *
+ * @since 9.0.4
+ */
+VALUE
+rb_grn_object_n_sub_records_accessor_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    bool n_sub_records_accessor_p = false;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+
+    if (context && object) {
+        n_sub_records_accessor_p = grn_obj_is_nsubrecs_accessor(context, object);
+    }
+
+    return CBOOL2RVAL(n_sub_records_accessor_p);
+}
+
 /*
  * Update the last modified time of the `object`. It's meaningful only
  * for persistent database, table and column.
@@ -1962,11 +2133,15 @@ rb_grn_object_dirty_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool is_dirty;
+    bool is_dirty = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
-    is_dirty = grn_obj_is_dirty(context, object);
+
+    if (context && object) {
+        is_dirty = grn_obj_is_dirty(context, object);
+    }
+
     return CBOOL2RVAL(is_dirty);
 }
 
@@ -1981,14 +2156,62 @@ rb_grn_object_corrupt_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *object;
-    grn_bool is_corrupt;
+    bool is_corrupt = false;
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
-    is_corrupt = grn_obj_is_corrupt(context, object);
+
+    if (context && object) {
+        is_corrupt = grn_obj_is_corrupt(context, object);
+    }
+
     return CBOOL2RVAL(is_corrupt);
 }
 
+/*
+ * @overload lexicon?
+ *   @return [Boolean] `true` if the object is lexicon, `false` otherwise.
+ *
+ * @since 9.0.4
+ */
+static VALUE
+rb_grn_object_lexicon_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    bool is_lexicon = false;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+
+    if (context && object) {
+        is_lexicon = grn_obj_is_lexicon(context, object);
+    }
+
+    return CBOOL2RVAL(is_lexicon);
+}
+
+/*
+ * @overload bulk?
+ *   @return [Boolean] `true` if the object is bulk, `false` otherwise.
+ *
+ * @since 9.0.4
+ */
+static VALUE
+rb_grn_object_bulk_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    bool is_bulk = false;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+    if (context && object) {
+        is_bulk = grn_obj_is_bulk(context, object);
+    }
+    return CBOOL2RVAL(is_bulk);
+}
+
 /*
  * @overload disk_usage
  *   @return [Integer] The number of bytes used by this object in disk.
@@ -2011,7 +2234,7 @@ rb_grn_object_get_disk_usage (VALUE self)
 void
 rb_grn_init_object (VALUE mGrn)
 {
-    rb_cGrnObject = rb_define_class_under(mGrn, "Object", rb_cData);
+    rb_cGrnObject = rb_define_class_under(mGrn, "Object", rb_cObject);
     rb_define_alloc_func(rb_cGrnObject, rb_grn_object_alloc);
 
     rb_define_attr(rb_cGrnObject, "context", GRN_TRUE, GRN_FALSE);
@@ -2064,6 +2287,14 @@ rb_grn_init_object (VALUE mGrn)
                      rb_grn_object_accessor_p, 0);
     rb_define_method(rb_cGrnObject, "key_accessor?",
                      rb_grn_object_key_accessor_p, 0);
+    rb_define_method(rb_cGrnObject, "id_accessor?",
+                     rb_grn_object_id_accessor_p, 0);
+    rb_define_method(rb_cGrnObject, "value_accessor?",
+                     rb_grn_object_value_accessor_p, 0);
+    rb_define_method(rb_cGrnObject, "score_accessor?",
+                     rb_grn_object_score_accessor_p, 0);
+    rb_define_method(rb_cGrnObject, "n_sub_records_accessor?",
+                     rb_grn_object_n_sub_records_accessor_p, 0);
 
     rb_define_method(rb_cGrnObject, "touch", rb_grn_object_touch, -1);
     rb_define_method(rb_cGrnObject, "last_modified",
@@ -2072,6 +2303,10 @@ rb_grn_init_object (VALUE mGrn)
                      rb_grn_object_dirty_p, 0);
     rb_define_method(rb_cGrnObject, "corrupt?",
                      rb_grn_object_corrupt_p, 0);
+    rb_define_method(rb_cGrnObject, "lexicon?",
+                     rb_grn_object_lexicon_p, 0);
+    rb_define_method(rb_cGrnObject, "bulk?",
+                     rb_grn_object_bulk_p, 0);
 
     rb_define_method(rb_cGrnObject, "disk_usage",
                      rb_grn_object_get_disk_usage, 0);