rroonga 10.0.6 → 11.0.0

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

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* vim: set sts=4 sw=4 ts=8 noet: */
 /*
-  Copyright (C) 2009-2014  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
@@ -19,7 +19,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnTableKeySupport *)DATA_PTR(object))
+#define SELF(object) ((RbGrnTableKeySupport *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnPatriciaTrie;
 

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2011-2015  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2011-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
@@ -17,34 +17,19 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "rb-grn.h"
-
-#define SELF(object) (RVAL2GRNCONTEXT(object))
-
-static VALUE cGrnPlugin;
-
 /*
  * Document-class: Groonga::Plugin
  *
- * プラグイン。現在のところ、Rubyでgroongaのプラグインを作成
+ * プラグイン。現在のところ、RubyでGroongaのプラグインを作成
  * することはできず、Cで作成された既存のプラグインを登録する
  * ことができるだけです。
  */
 
-grn_id
-rb_grn_plugin_from_ruby_object (VALUE object)
-{
-    RbGrnPlugin *rb_grn_plugin;
+#include "rb-grn.h"
 
-    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, cGrnPlugin))) {
-        rb_raise(rb_eTypeError, "not a groonga plugin");
-    }
+#define SELF(object) (RVAL2GRNCONTEXT(object))
 
-    Data_Get_Struct(object, RbGrnPlugin, rb_grn_plugin);
-    if (!rb_grn_plugin)
-        rb_raise(rb_eGrnError, "groonga plugin is NULL");
-    return rb_grn_plugin->id;
-}
+static VALUE cGrnPlugin;
 
 void
 rb_grn_plugin_fin (grn_id id)
@@ -59,10 +44,37 @@ rb_grn_plugin_free (void *pointer)
     xfree(rb_grn_plugin);
 }
 
+static rb_data_type_t data_type = {
+    "Groonga::Plugin",
+    {
+        NULL,
+        rb_grn_plugin_free,
+        NULL,
+    },
+    NULL,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+grn_id
+rb_grn_plugin_from_ruby_object (VALUE object)
+{
+    RbGrnPlugin *rb_grn_plugin;
+
+    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, cGrnPlugin))) {
+        rb_raise(rb_eTypeError, "not a groonga plugin");
+    }
+
+    TypedData_Get_Struct(object, RbGrnPlugin, &data_type, rb_grn_plugin);
+    if (!rb_grn_plugin)
+        rb_raise(rb_eGrnError, "groonga plugin is NULL");
+    return rb_grn_plugin->id;
+}
+
 static VALUE
 rb_grn_plugin_alloc (VALUE klass)
 {
-    return Data_Wrap_Struct(klass, NULL, rb_grn_plugin_free, NULL);
+    return TypedData_Wrap_Struct(klass, &data_type, NULL);
 }
 
 /*
@@ -245,7 +257,7 @@ rb_grn_plugin_s_names (int argc, VALUE *argv, VALUE klass)
 void
 rb_grn_init_plugin (VALUE mGrn)
 {
-    cGrnPlugin = rb_define_class_under(mGrn, "Plugin", rb_cData);
+    cGrnPlugin = rb_define_class_under(mGrn, "Plugin", rb_cObject);
     rb_define_alloc_func(cGrnPlugin, rb_grn_plugin_alloc);
 
     rb_define_singleton_method(cGrnPlugin, "register",

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2016-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
@@ -60,5 +60,5 @@ void
 rb_grn_init_request_timer_id (VALUE mGrn)
 {
     rb_cGrnRequestTimerID =
-        rb_define_class_under(mGrn, "RequestTimerID", rb_cData);
+        rb_define_class_under(mGrn, "RequestTimerID", rb_cObject);
 }

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2014  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) ((RbGrnSnippet *)DATA_PTR(object))
+#define SELF(object) ((RbGrnSnippet *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnSnippet;
 
@@ -149,7 +149,7 @@ rb_grn_snippet_initialize (int argc, VALUE *argv, VALUE self)
     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));
+    rb_grn_context_register_floating_object(RTYPEDDATA_DATA(self));
 
     rb_iv_set(self, "@context", rb_context);
 

data/ext/groonga/rb-grn-table-cursor-key-support.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-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) ((RbGrnTableCursor *)DATA_PTR(object))
+#define SELF(object) ((RbGrnTableCursor *)RTYPEDDATA_DATA(object))
 
 VALUE rb_mGrnTableCursorKeySupport;
 

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2013  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) ((RbGrnTableCursor *)DATA_PTR(object))
+#define SELF(object) ((RbGrnTableCursor *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnTableCursor;
 
@@ -277,7 +277,7 @@ rb_grn_table_cursor_each (VALUE self)
 void
 rb_grn_init_table_cursor (VALUE mGrn)
 {
-    rb_cGrnTableCursor = rb_define_class_under(mGrn, "TableCursor", rb_cData);
+    rb_cGrnTableCursor = rb_define_class_under(mGrn, "TableCursor", rb_cObject);
     rb_define_alloc_func(rb_cGrnTableCursor, rb_grn_object_alloc);
 
     rb_include_module(rb_cGrnTableCursor, rb_mEnumerable);

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2020  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2009-2021  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2014-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) ((RbGrnTableKeySupport *)DATA_PTR(object))
+#define SELF(object) ((RbGrnTableKeySupport *)RTYPEDDATA_DATA(object))
 
 VALUE rb_mGrnTableKeySupport;
 
@@ -498,7 +498,7 @@ set_value (RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg))
                  rb_grn_inspect(rb_name), rb_grn_inspect(data->self));
     }
 
-    rb_grn_object = RB_GRN_OBJECT(DATA_PTR(rb_column));
+    rb_grn_object = RB_GRN_OBJECT(RTYPEDDATA_DATA(rb_column));
     return rb_grn_object_set_raw(rb_grn_object,
                                  data->id, rb_value, GRN_OBJ_SET, data->self);
 }

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

@@ -1,6 +1,6 @@
 /* -*- 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) 2014-2016  Masafumi Yokoyama <yokoyama@clear-code.com>
   Copyright (C) 2019  Horimoto Yasuhiro <horimoto@clear-code.com>
 
@@ -20,13 +20,6 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnTable *)DATA_PTR(object))
-
-VALUE rb_cGrnTable;
-
-static ID id_array_reference;
-static ID id_array_set;
-
 /*
  * Document-class: Groonga::Table < Groonga::Object
  *
@@ -35,6 +28,59 @@ static ID id_array_set;
  * are extended from this class.
  */
 
+#define SELF(object) ((RbGrnTable *)RTYPEDDATA_DATA(object))
+
+VALUE rb_cGrnTable;
+
+static ID id_array_reference;
+static ID id_array_set;
+
+static void
+rb_grn_table_mark (void *data)
+{
+    RbGrnObject *rb_grn_object = data;
+    RbGrnTable *rb_grn_table = data;
+    grn_ctx *context;
+    grn_obj *table;
+
+    if (!rb_grn_object)
+        return;
+
+    rb_gc_mark(rb_grn_table->columns);
+
+    context = rb_grn_object->context;
+    table = rb_grn_object->object;
+    if (!context || !table)
+        return;
+
+    rb_grn_context_mark_grn_id(context, table->header.domain);
+    rb_grn_context_mark_grn_id(context, grn_obj_get_range(context, table));
+
+    if (!grn_obj_path(context, table))
+        return;
+
+    if (grn_obj_name(context, table, NULL, 0) == 0)
+        return;
+}
+
+static void
+rb_grn_table_free (void *pointer)
+{
+    rb_grn_object_free(pointer);
+}
+
+static rb_data_type_t data_type = {
+    "Groonga::Table",
+    {
+        rb_grn_table_mark,
+        rb_grn_table_free,
+        NULL,
+    },
+    &rb_grn_object_data_type,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 grn_obj *
 rb_grn_table_from_ruby_object (VALUE object, grn_ctx **context)
 {
@@ -101,38 +147,10 @@ rb_grn_table_deconstruct (RbGrnTable *rb_grn_table,
         *columns = rb_grn_table->columns;
 }
 
-static void
-rb_grn_table_mark (void *data)
-{
-    RbGrnObject *rb_grn_object = data;
-    RbGrnTable *rb_grn_table = data;
-    grn_ctx *context;
-    grn_obj *table;
-
-    if (!rb_grn_object)
-        return;
-
-    rb_gc_mark(rb_grn_table->columns);
-
-    context = rb_grn_object->context;
-    table = rb_grn_object->object;
-    if (!context || !table)
-        return;
-
-    rb_grn_context_mark_grn_id(context, table->header.domain);
-    rb_grn_context_mark_grn_id(context, grn_obj_get_range(context, table));
-
-    if (!grn_obj_path(context, table))
-        return;
-
-    if (grn_obj_name(context, table, NULL, 0) == 0)
-        return;
-}
-
 static VALUE
 rb_grn_table_alloc (VALUE klass)
 {
-    return Data_Wrap_Struct(klass, rb_grn_table_mark, rb_grn_object_free, NULL);
+    return TypedData_Wrap_Struct(klass, &data_type, NULL);
 }
 
 static VALUE
@@ -342,7 +360,7 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
 
     rb_column = GRNCOLUMN2RVAL(Qnil, context, column, GRN_TRUE);
     rb_ary_push(columns, rb_column);
-    rb_grn_named_object_set_name(RB_GRN_NAMED_OBJECT(DATA_PTR(rb_column)),
+    rb_grn_named_object_set_name(RB_GRN_NAMED_OBJECT(RTYPEDDATA_DATA(rb_column)),
                                  name, name_size);
 
     return rb_column;
@@ -497,7 +515,7 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self)
         rb_funcall(rb_column, rb_intern("sources="), 1, rb_sources);
 
     rb_ary_push(columns, rb_column);
-    rb_grn_named_object_set_name(RB_GRN_NAMED_OBJECT(DATA_PTR(rb_column)),
+    rb_grn_named_object_set_name(RB_GRN_NAMED_OBJECT(RTYPEDDATA_DATA(rb_column)),
                                  name, name_size);
 
     return rb_column;
@@ -558,7 +576,7 @@ rb_grn_table_get_column (VALUE self, VALUE rb_name)
         VALUE rb_column = raw_columns[i];
         RbGrnNamedObject *rb_grn_named_object;
 
-        rb_grn_named_object = RB_GRN_NAMED_OBJECT(DATA_PTR(rb_column));
+        rb_grn_named_object = RB_GRN_NAMED_OBJECT(RTYPEDDATA_DATA(rb_column));
         if (name_size == rb_grn_named_object->name_size &&
             memcmp(name, rb_grn_named_object->name, name_size) == 0) {
             return rb_column;
@@ -583,9 +601,9 @@ rb_grn_table_get_column (VALUE self, VALUE rb_name)
     owner = column->header.type == GRN_ACCESSOR;
     rb_column = GRNCOLUMN2RVAL(Qnil, context, column, owner);
     if (owner) {
-        rb_grn_context_register_floating_object(DATA_PTR(rb_column));
+        rb_grn_context_register_floating_object(RTYPEDDATA_DATA(rb_column));
     }
-    rb_grn_named_object_set_name(RB_GRN_NAMED_OBJECT(DATA_PTR(rb_column)),
+    rb_grn_named_object_set_name(RB_GRN_NAMED_OBJECT(RTYPEDDATA_DATA(rb_column)),
                                  name, name_size);
 
     return rb_column;
@@ -688,7 +706,7 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
             RbGrnNamedObject *rb_grn_named_object;
             name_size = grn_column_name(context, column,
                                         name, GRN_TABLE_MAX_KEY_SIZE);
-            rb_grn_named_object = RB_GRN_NAMED_OBJECT(DATA_PTR(rb_column));
+            rb_grn_named_object = RB_GRN_NAMED_OBJECT(RTYPEDDATA_DATA(rb_column));
             rb_grn_named_object_set_name(rb_grn_named_object, name, name_size);
         }
 
@@ -1092,7 +1110,7 @@ rb_grn_table_delete_by_expression (VALUE self)
 
     rb_builder = rb_grn_record_expression_builder_new(self, Qnil);
     rb_expression = rb_grn_record_expression_builder_build(rb_builder);
-    rb_grn_object_deconstruct(RB_GRN_OBJECT(DATA_PTR(rb_expression)),
+    rb_grn_object_deconstruct(RB_GRN_OBJECT(RTYPEDDATA_DATA(rb_expression)),
                               &expression, NULL,
                               NULL, NULL, NULL, NULL);
 
@@ -2394,7 +2412,7 @@ rb_grn_table_select (int argc, VALUE *argv, VALUE self)
       rb_funcall(builder, rb_intern("default_column="), 1, rb_default_column);
       rb_expression = rb_grn_record_expression_builder_build(builder);
     }
-    rb_grn_object_deconstruct(RB_GRN_OBJECT(DATA_PTR(rb_expression)),
+    rb_grn_object_deconstruct(RB_GRN_OBJECT(RTYPEDDATA_DATA(rb_expression)),
                               &expression, NULL,
                               NULL, NULL, NULL, NULL);
 

data/ext/groonga/rb-grn-variable-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) 2014-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) ((RbGrnVariableSizeColumn *)DATA_PTR(object))
+#define SELF(object) ((RbGrnVariableSizeColumn *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnVariableSizeColumn;
 

data/ext/groonga/rb-grn-variable.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-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) ((RbGrnVariable *)DATA_PTR(object))
+#define SELF(object) ((RbGrnVariable *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnVariable;
 

data/ext/groonga/rb-grn.h

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2020  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2009-2021  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2015-2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -91,9 +91,9 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_HAVE_FLOAT32 GRN_VERSION_OR_LATER(10, 0, 2)
 
-#define RB_GRN_MAJOR_VERSION 10
+#define RB_GRN_MAJOR_VERSION 11
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 6
+#define RB_GRN_MICRO_VERSION 0
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))
@@ -314,6 +314,8 @@ RB_GRN_VAR VALUE rb_mGrnRequestTimer;
 RB_GRN_VAR VALUE rb_cGrnRequestTimerID;
 RB_GRN_VAR VALUE rb_cGrnColumnCache;
 
+RB_GRN_VAR rb_data_type_t rb_grn_object_data_type;
+
 void           rb_grn_init_utils                    (VALUE mGrn);
 void           rb_grn_init_exception                (VALUE mGrn);
 void           rb_grn_init_encoding                 (VALUE mGrn);
@@ -779,7 +781,8 @@ rb_encoding   *rb_grn_encoding_to_ruby_encoding     (grn_encoding encoding);
 VALUE          rb_grn_encoding_to_ruby_encoding_object
                                                     (grn_encoding encoding);
 
-grn_ctx       *rb_grn_context_from_ruby_object      (VALUE object);
+RbGrnContext  *rb_grn_context_get_struct            (VALUE rb_context);
+grn_ctx       *rb_grn_context_from_ruby_object      (VALUE rb_context);
 VALUE          rb_grn_context_to_ruby_object        (grn_ctx *context);
 VALUE          rb_grn_context_rb_string_new         (grn_ctx *context,
                                                      const char *string,