rroonga 10.0.1 → 11.0.6

data/ext/groonga/rb-grn-database.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>
   Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -17,12 +17,6 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "rb-grn.h"
-
-#define SELF(object) ((RbGrnObject *)DATA_PTR(object))
-
-VALUE rb_cGrnDatabase;
-
 /*
  * Document-class: Groonga::Database
  *
@@ -34,22 +28,11 @@ VALUE rb_cGrnDatabase;
  * に作成されないので明示的に作成する必要がある。
  */
 
-grn_obj *
-rb_grn_database_from_ruby_object (VALUE object)
-{
-    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGrnDatabase))) {
-        rb_raise(rb_eTypeError, "not a groonga database");
-    }
+#include "rb-grn.h"
 
-    return RVAL2GRNOBJECT(object, NULL);
-}
+#define SELF(object) ((RbGrnObject *)RTYPEDDATA_DATA(object))
 
-VALUE
-rb_grn_database_to_ruby_object (grn_ctx *context, grn_obj *database,
-                                grn_bool owner)
-{
-    return GRNOBJECT2RVAL(rb_cGrnDatabase, context, database, owner);
-}
+VALUE rb_cGrnDatabase;
 
 static void
 rb_grn_database_mark_existing_ruby_object (grn_ctx *context, grn_obj *database)
@@ -86,11 +69,45 @@ rb_grn_database_mark (void *data)
     rb_grn_database_mark_existing_ruby_object(context, database);
 }
 
+static void
+rb_grn_database_free (void *pointer)
+{
+    rb_grn_object_free(pointer);
+}
+
+static rb_data_type_t data_type = {
+    "Groonga::Database",
+    {
+        rb_grn_database_mark,
+        rb_grn_database_free,
+        NULL,
+    },
+    &rb_grn_object_data_type,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+grn_obj *
+rb_grn_database_from_ruby_object (VALUE object)
+{
+    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGrnDatabase))) {
+        rb_raise(rb_eTypeError, "not a Rroonga database");
+    }
+
+    return RVAL2GRNOBJECT(object, NULL);
+}
+
+VALUE
+rb_grn_database_to_ruby_object (grn_ctx *context, grn_obj *database,
+                                grn_bool owner)
+{
+    return GRNOBJECT2RVAL(rb_cGrnDatabase, context, database, owner);
+}
+
 static VALUE
 rb_grn_database_alloc (VALUE klass)
 {
-    return Data_Wrap_Struct(klass, rb_grn_database_mark, rb_grn_object_free,
-                            NULL);
+    return TypedData_Wrap_Struct(klass, &data_type, NULL);
 }
 
 static void
@@ -143,8 +160,7 @@ rb_grn_database_close (VALUE self)
 static void
 reset_floating_objects (VALUE rb_context)
 {
-    RbGrnContext *rb_grn_context;
-    Data_Get_Struct(rb_context, RbGrnContext, rb_grn_context);
+    RbGrnContext *rb_grn_context = rb_grn_context_get_struct(rb_context);
     rb_grn_context_reset_floating_objects(rb_grn_context);
 }
 
@@ -189,8 +205,10 @@ rb_grn_database_s_create (int argc, VALUE *argv, VALUE klass)
                         "builtin_type_names", &builtin_type_names,
                         NULL);
 
-    if (!NIL_P(rb_path))
+    if (!NIL_P(rb_path)) {
+        FilePathValue(rb_path);
         path = StringValuePtr(rb_path);
+    }
     context = rb_grn_context_ensure(&rb_context);
 
     create_args.builtin_type_names = NULL;
@@ -245,6 +263,7 @@ rb_grn_database_initialize (int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "11", &rb_path, &options);
 
+    FilePathValue(rb_path);
     path = StringValuePtr(rb_path);
     rb_grn_scan_options(options,
                         "context", &rb_context,

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;
 

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,8 +1,8 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2019  Horimoto Yasuhiro <horimoto@clear-code.com>
-  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
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#define SELF(object) ((RbGrnIndexColumn *)DATA_PTR(object))
+#define SELF(object) ((RbGrnIndexColumn *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnIndexColumn;
 

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

@@ -1,7 +1,7 @@
 /* -*- 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
@@ -20,7 +20,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnIndexCursor *)DATA_PTR(object))
+#define SELF(object) ((RbGrnIndexCursor *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnIndexCursor;
 

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-object.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-2016  Masafumi Yokoyama <yokoyama@clear-code.com>
   Copyright (C) 2019  Horimoto Yasuhiro <horimoto@clear-code.com>
 
@@ -28,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)
 {
@@ -73,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");
 
@@ -350,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
@@ -359,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;
@@ -419,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
@@ -2213,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);