rroonga 10.0.6 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2dda7dccd26063c5e82e93255c933215a21a37e0c31838eec124b3f12ce3892
-  data.tar.gz: 472fed29e2ba91ff00dd71981ff59a6866c9a292ea7ac83dc5881bd1069536e1
+  metadata.gz: d2e5c28e453fae2876164e7ea4ef8e3e24b0e789bec2c6cd270850905296a9c5
+  data.tar.gz: 8f8cac4d824bc94e0f89dd8ee60e8b2a0fd0fb92b1e666dfbb7732ef43c7bb96
 SHA512:
-  metadata.gz: 0f4c1aa03b1efc04321588d3dfac9a208dafc35c2a1a84724e47a035a1a3eb7cabeaa6d58655fe6e324c1fbfa706812a5c0cdb817686cbde2a947659c3231c76
-  data.tar.gz: fe41f7d510f5ddb1cdd88a8d6de87d477f0f45714f09691b01b2a750bd89c31dd2a60ae334f15e216bfa4fa7752f10f765112efce4c75ecd7084a42b27af837f
+  metadata.gz: e23a7b4d5aaa7375ee7347fdce6706d90311f8447ec41d7ecf7d0864258f9992cbba7a9521d5afd5589197a25e3b3acece7c7c515ecfb2980daa8329639a678b
+  data.tar.gz: cefd86c0fc0053aa34d669b4cb94f78d38dc63ee4faea9c32b1a5519fc231f99bc1146e8f54bb50d38a60d89e1129a7e5145bc03107f05cf3925cd8687cf98fa

data/Rakefile

@@ -74,4 +74,28 @@ namespace :test do
   end
 end
 
+def update_version(new_version)
+  splitted_new_version = new_version.split(".")
+  type_order = ["MAJOR", "MINOR", "MICRO"]
+  File.open("ext/groonga/rb-grn.h", "rb+") do |rb_grn_h|
+    content = rb_grn_h.read
+    content.gsub!(/(RB_GRN_(MAJOR|MINOR|MICRO)_VERSION) \d+/) do
+      name = $1
+      type = $2
+      "#{name} #{splitted_new_version[type_order.index(type)]}"
+    end
+    rb_grn_h.rewind
+    rb_grn_h.write(content)
+  end
+end
+
+namespace :version do
+  desc "Update version"
+  task :update do |_, args|
+    new_version = ENV["NEW_VERSION"]
+    raise "NEW_VERSION must be specified" if new_version.nil?
+    update_version(new_version)
+  end
+end
+
 task :default => :test

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # NEWS
 
+## 11.0.0: 2021-02-09 {#version-11-0-0}
+
+### Improvements
+
+  * {Groonga::ConnectionReset} Added.
+
+  * {Groonga::Context.open} Added.
+
+  * Added support for Ractor.
+
+  * {Groonga::Database} Accept path like object in .open/.create.
+
 ## 10.0.6: 2020-09-01 {#version-10-0-6}
 
 ### Fixes

data/ext/groonga/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009-2020  Sutou Kouhei <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
@@ -23,6 +23,7 @@ require "shellwords"
 require "open-uri"
 require "uri"
 
+require "native-package-installer"
 require "pkg-config"
 
 base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
@@ -77,7 +78,7 @@ def download(url)
         ]
       end
     end
-    open(url, "rb", options) do |input|
+    URI.open(url, "rb", *options) do |input|
       File.open(base_name, "wb") do |output|
         while (buffer = input.read(1024))
           output.print(buffer)
@@ -223,7 +224,16 @@ def install_local_groonga(package_name, major, minor, micro)
   add_rpath_for_local_groonga
 end
 
+need_auto_groonga_install = false
 unless PKGConfig.have_package(package_name, major, minor, micro)
+  if NativePackageInstaller.install(debian: "libgroonga-dev",
+                                    homebrew: "groonga",
+                                    msys2: "groonga")
+    need_auto_groonga_install =
+      !PKGConfig.have_package(package_name, major, minor, micro)
+  end
+end
+if need_auto_groonga_install
   install_local_groonga(package_name, major, minor, micro)
 end
 

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

data/ext/groonga/rb-grn-column-cache.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) 2018  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2018-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
@@ -120,7 +120,7 @@ rb_grn_column_cache_initialize (VALUE self, VALUE rb_column)
     rb_grn_column_cache->context = NULL;
     rb_grn_column_cache->rb_column = rb_column;
     rb_grn_column_cache->column_cache = NULL;
-    DATA_PTR(self) = rb_grn_column_cache;
+    RTYPEDDATA_DATA(self) = rb_grn_column_cache;
 
     column = RVAL2GRNCOLUMN(rb_column, &(rb_grn_column_cache->context));
     context = rb_grn_column_cache->context;
@@ -216,7 +216,7 @@ void
 rb_grn_init_column_cache (VALUE mGrn)
 {
     rb_cGrnColumnCache =
-        rb_define_class_under(mGrn, "ColumnCache", rb_cData);
+        rb_define_class_under(mGrn, "ColumnCache", rb_cObject);
 
     rb_define_alloc_func(rb_cGrnColumnCache, rb_grn_column_cache_allocate);
 

data/ext/groonga/rb-grn-column.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-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
@@ -20,7 +20,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnColumn *)DATA_PTR(object))
+#define SELF(object) ((RbGrnColumn *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnColumn;
 
@@ -388,7 +388,7 @@ rb_grn_column_select (int argc, VALUE *argv, VALUE self)
       rb_funcall(builder, rb_intern("allow_leading_not="), 1, rb_allow_leading_not);
       rb_expression = rb_grn_column_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);
 
@@ -831,7 +831,7 @@ rb_grn_column_rename (VALUE self, VALUE rb_name)
     rc = grn_column_rename(context, column, name, name_size);
     rb_grn_context_check(context, self);
     rb_grn_rc_check(rc, self);
-    rb_grn_named_object_set_name(RB_GRN_NAMED_OBJECT(DATA_PTR(self)),
+    rb_grn_named_object_set_name(RB_GRN_NAMED_OBJECT(RTYPEDDATA_DATA(self)),
                                  name, name_size);
     return self;
 }

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2010-2018  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2010-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>
 
@@ -18,12 +18,6 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "rb-grn.h"
-
-#define SELF(object) (RVAL2GRNCONTEXT(object))
-
-static VALUE cGrnContext;
-
 /*
  * Document-class: Groonga::Context
  *
@@ -45,23 +39,11 @@ static VALUE cGrnContext;
  * する。
  */
 
-grn_ctx *
-rb_grn_context_from_ruby_object (VALUE object)
-{
-    RbGrnContext *rb_grn_context;
+#include "rb-grn.h"
 
-    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, cGrnContext))) {
-        rb_raise(rb_eTypeError, "not a Groonga context");
-    }
+#define SELF(object) (RVAL2GRNCONTEXT(object))
 
-    Data_Get_Struct(object, RbGrnContext, rb_grn_context);
-    if (!rb_grn_context)
-        rb_raise(rb_eGrnError, "Groonga context is NULL");
-    if (!rb_grn_context->context)
-        rb_raise(rb_eGrnClosed,
-                 "can't access already closed Groonga context");
-    return rb_grn_context->context;
-}
+static VALUE cGrnContext;
 
 void
 rb_grn_context_register_floating_object (RbGrnObject *rb_grn_object)
@@ -210,10 +192,48 @@ rb_grn_context_free (void *pointer)
     xfree(rb_grn_context);
 }
 
+static rb_data_type_t data_type = {
+    "Groonga::Context",
+    {
+        NULL,
+        rb_grn_context_free,
+        NULL,
+    },
+    NULL,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+RbGrnContext *
+rb_grn_context_get_struct (VALUE rb_context)
+{
+    if (!RVAL2CBOOL(rb_obj_is_kind_of(rb_context, cGrnContext))) {
+        rb_raise(rb_eTypeError,
+                 "not a Groonga context: %" PRIsVALUE,
+                 rb_context);
+    }
+
+    RbGrnContext *rb_grn_context;
+    TypedData_Get_Struct(rb_context, RbGrnContext, &data_type, rb_grn_context);
+    return rb_grn_context;
+}
+
+grn_ctx *
+rb_grn_context_from_ruby_object (VALUE rb_context)
+{
+    RbGrnContext *rb_grn_context = rb_grn_context_get_struct(rb_context);
+    if (!rb_grn_context)
+        rb_raise(rb_eGrnError, "Groonga context is NULL");
+    if (!rb_grn_context->context)
+        rb_raise(rb_eGrnClosed,
+                 "can't access already closed Groonga context");
+    return rb_grn_context->context;
+}
+
 static VALUE
 rb_grn_context_alloc (VALUE klass)
 {
-    return Data_Wrap_Struct(klass, NULL, rb_grn_context_free, NULL);
+    return TypedData_Wrap_Struct(klass, &data_type, NULL);
 }
 
 static grn_obj *
@@ -426,41 +446,50 @@ rb_grn_context_s_set_default_options (VALUE self, VALUE options)
 }
 
 /*
- * コンテキストを作成する。
- * @overload new(options=nil)
- *   @param [::Hash] options The name and value
- *     pairs. Omitted names are initialized as the default value.
- *   @option options [Groonga::Encoding] :encoding The encoding
- *     エンコーディングを指定する。エンコーディングの指定方法
- *     は {Groonga::Encoding} を参照。
+ * Creates a new context.
+ *
+ * @overload new(encoding: nil)
+ *   @param encoding [Groonga::Encoding] The encoding to be used in
+ *     the newly created context. See {Groonga::Encoding} how to specify
+ *     encoding.
+ *   @return [Groonga::Context] The newly created context.
  */
 static VALUE
 rb_grn_context_initialize (int argc, VALUE *argv, VALUE self)
 {
-    RbGrnContext *rb_grn_context;
-    grn_ctx *context;
-    int flags = 0; /* TODO: GRN_CTX_PER_DB */
-    VALUE options, default_options;
-    VALUE rb_encoding;
-
-    rb_scan_args(argc, argv, "01", &options);
-    default_options = rb_grn_context_s_get_default_options(rb_obj_class(self));
-    if (NIL_P(default_options))
-        default_options = rb_hash_new();
+    VALUE options;
+    rb_scan_args(argc, argv, ":", &options);
 
-    if (NIL_P(options))
-        options = rb_hash_new();
-    options = rb_funcall(default_options, rb_intern("merge"), 1, options);
-
-    rb_grn_scan_options(options,
-                        "encoding", &rb_encoding,
-                        NULL);
+    static ID keyword_ids[1];
+    if (!keyword_ids[0]) {
+        CONST_ID(keyword_ids[0], "encoding");
+    }
+    VALUE kwargs[1];
+    VALUE rb_encoding = Qundef;
+    if (!NIL_P(options)) {
+        rb_get_kwargs(options, keyword_ids, 0, 1, kwargs);
+        rb_encoding = kwargs[0];
+    }
+    if (rb_encoding == Qundef) {
+        VALUE default_options =
+            rb_grn_context_s_get_default_options(rb_obj_class(self));
+        if (!NIL_P(default_options)) {
+            rb_get_kwargs(default_options, keyword_ids, 0, 1, kwargs);
+            rb_encoding = kwargs[0];
+        }
+        if (rb_encoding == Qundef) {
+            rb_encoding = Qnil;
+        }
+    }
 
-    rb_grn_context = ALLOC(RbGrnContext);
-    DATA_PTR(self) = rb_grn_context;
+    RbGrnContext *rb_grn_context = ALLOC(RbGrnContext);
+    RTYPEDDATA_DATA(self) = rb_grn_context;
     rb_grn_context->self = self;
+    int flags = 0; /* TODO: GRN_CTX_PER_DB */
     grn_ctx_init(&(rb_grn_context->context_entity), flags);
-    context = rb_grn_context->context = &(rb_grn_context->context_entity);
+    grn_ctx *context =
+        rb_grn_context->context =
+        &(rb_grn_context->context_entity);
     rb_grn_context_check(context, self);
 
     GRN_CTX_USER_DATA(context)->ptr = rb_grn_context;
@@ -491,9 +520,7 @@ rb_grn_context_initialize (int argc, VALUE *argv, VALUE self)
 static VALUE
 rb_grn_context_close (VALUE self)
 {
-    RbGrnContext *rb_grn_context;
-
-    Data_Get_Struct(self, RbGrnContext, rb_grn_context);
+    RbGrnContext *rb_grn_context = RTYPEDDATA_DATA(self);
     if (rb_grn_context->context) {
         rb_grn_context_fin(rb_grn_context);
     }
@@ -509,10 +536,7 @@ rb_grn_context_close (VALUE self)
 static VALUE
 rb_grn_context_closed_p (VALUE self)
 {
-    RbGrnContext *rb_grn_context;
-
-    Data_Get_Struct(self, RbGrnContext, rb_grn_context);
-
+    RbGrnContext *rb_grn_context = RTYPEDDATA_DATA(self);
     return CBOOL2RVAL(rb_grn_context->context == NULL);
 }
 
@@ -1035,7 +1059,7 @@ rb_grn_context_object_created (VALUE rb_context, VALUE rb_object)
 void
 rb_grn_init_context (VALUE mGrn)
 {
-    cGrnContext = rb_define_class_under(mGrn, "Context", rb_cData);
+    cGrnContext = rb_define_class_under(mGrn, "Context", rb_cObject);
     rb_define_alloc_func(cGrnContext, rb_grn_context_alloc);
 
     rb_cv_set(cGrnContext, "@@default", Qnil);

data/ext/groonga/rb-grn-data-column.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) 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
@@ -19,7 +19,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnColumn *)DATA_PTR(object))
+#define SELF(object) ((RbGrnColumn *)RTYPEDDATA_DATA(object))
 
 VALUE rb_cGrnDataColumn;
 
@@ -152,7 +152,7 @@ rb_grn_data_column_apply_window_function (int argc, VALUE *argv, VALUE self)
     rb_builder = rb_grn_record_expression_builder_new(rb_table, Qnil);
     rb_window_function_call =
         rb_grn_record_expression_builder_build(rb_builder);
-    rb_grn_object_deconstruct(RB_GRN_OBJECT(DATA_PTR(rb_window_function_call)),
+    rb_grn_object_deconstruct(RB_GRN_OBJECT(RTYPEDDATA_DATA(rb_window_function_call)),
                               &window_function_call, NULL,
                               NULL, NULL, NULL, NULL);
 
@@ -231,7 +231,7 @@ rb_grn_data_column_apply_expression (VALUE self)
 
     rb_builder = rb_grn_record_expression_builder_new(rb_table, 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);
 

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,