rroonga 11.0.0 → 12.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2e5c28e453fae2876164e7ea4ef8e3e24b0e789bec2c6cd270850905296a9c5
-  data.tar.gz: 8f8cac4d824bc94e0f89dd8ee60e8b2a0fd0fb92b1e666dfbb7732ef43c7bb96
+  metadata.gz: 9e1afd17d5a479b6e5c472729d3548f3551b15cec0db30bbf46f8a43266d96a1
+  data.tar.gz: 05b218925dfbf29f4deb9d34c5ab6408cbcecdf11de588d2c8d45efaf0e28417
 SHA512:
-  metadata.gz: e23a7b4d5aaa7375ee7347fdce6706d90311f8447ec41d7ecf7d0864258f9992cbba7a9521d5afd5589197a25e3b3acece7c7c515ecfb2980daa8329639a678b
-  data.tar.gz: cefd86c0fc0053aa34d669b4cb94f78d38dc63ee4faea9c32b1a5519fc231f99bc1146e8f54bb50d38a60d89e1129a7e5145bc03107f05cf3925cd8687cf98fa
+  metadata.gz: ce775711f0f90338164a3f5c3f5c7731b9f8d06e8563836f0adb7de325f471d43d9be5bb09a428f2598e801dca502564fbea3b9cb285bb38d8f7310cd22a7251
+  data.tar.gz: fe208b1bf0ee5e04fbccbe6220b2b0b44e80e9825c8b9aaab86017d7d87de8185a7a51eea026532b6d13fdcd310cab7e8484702514e5b256d6957f984107f2c2

data/doc/text/news.md

@@ -1,5 +1,35 @@
 # NEWS
 
+## 12.0.2: 2022-04-04 {#version-12-0-2}
+
+### Improvements
+
+  * Added support for `:weight_float32` for vector column. This
+    requires Groonga 12.0.2 or later.
+
+  * Removed needless `Groonga::IndexColumn#with_weight?`.
+
+  * Added support for `:missing_mode` and `:invalid_mode` for scalar
+    column and vector column. This requires Groonga 12.0.2 or later.
+
+## 12.0.0: 2022-02-09 {#version-12-0-0}
+
+### Improvements
+
+  * Added support for Ruby 3.1.
+
+## 11.0.6: 2021-09-24 {#version-11-0-6}
+
+### Improvements
+
+  * Installed Groonga automatically when native package isn't
+    installed automatically.
+    [GitHub#204][Patch by skawaji]
+
+### Thanks
+
+  * skawaji
+
 ## 11.0.0: 2021-02-09 {#version-11-0-0}
 
 ### Improvements

data/ext/groonga/extconf.rb

@@ -231,6 +231,8 @@ unless PKGConfig.have_package(package_name, major, minor, micro)
                                     msys2: "groonga")
     need_auto_groonga_install =
       !PKGConfig.have_package(package_name, major, minor, micro)
+  else
+    need_auto_groonga_install = true
   end
 end
 if need_auto_groonga_install

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-2021  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2009-2022  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
@@ -714,7 +714,7 @@ rb_grn_column_data_p (VALUE self)
 
 /*
  * @overload with_weight?
- * @return [Boolean] @true@ if the column is vector and created with
+ * @return [Boolean] @true@ if the column is created with
  *   @:with_weight => true@ flag, @false@ otherwise.
  * @since 4.0.1
  */
@@ -733,6 +733,26 @@ rb_grn_column_with_weight_p(VALUE self)
     return CBOOL2RVAL(flags & GRN_OBJ_WITH_WEIGHT);
 }
 
+/*
+ * @overload weight_float32?
+ * @return [Boolean] @true@ if the column uses 32 bit float for weight.
+ * @since 12.0.2
+ */
+static VALUE
+rb_grn_column_weight_float32_p(VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL(flags & GRN_OBJ_WEIGHT_FLOAT32);
+}
+
 /*
  * Return indexes on `column`. If operator is specified, indexes that
  * can executes the operator are only returned. Otherwise, all indexes
@@ -867,6 +887,8 @@ rb_grn_init_column (VALUE mGrn)
 
     rb_define_method(rb_cGrnColumn, "with_weight?",
                      rb_grn_column_with_weight_p, 0);
+    rb_define_method(rb_cGrnColumn, "weight_float32?",
+                     rb_grn_column_weight_float32_p, 0);
 
     rb_define_method(rb_cGrnColumn, "find_indexes",
                      rb_grn_column_find_indexes, -1);

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-2021  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2016-2022  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
@@ -245,6 +245,180 @@ rb_grn_data_column_apply_expression (VALUE self)
     return self;
 }
 
+/*
+ * @overload missing_mode
+ * @return [:add, :ignore, :nil] The missing mode of the column.
+ * @since 12.0.2
+ */
+static VALUE
+rb_grn_data_column_get_missing_mode(VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    switch ((flags & GRN_OBJ_MISSING_MASK)) {
+    case GRN_OBJ_MISSING_IGNORE:
+        return rb_id2sym(rb_intern("ignore"));
+    case GRN_OBJ_MISSING_NIL:
+        return rb_id2sym(rb_intern("nil"));
+    default:
+        return rb_id2sym(rb_intern("add"));
+    }
+}
+
+/*
+ * @overload missing_add?
+ * @return [Boolean] @true@ if the column uses @:add@ missing mode.
+ * @since 12.0.2
+ */
+static VALUE
+rb_grn_data_column_missing_add_p(VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL((flags & GRN_OBJ_MISSING_MASK) == GRN_OBJ_MISSING_ADD);
+}
+
+/*
+ * @overload missing_ignore?
+ * @return [Boolean] @true@ if the column uses @:ignore@ missing mode.
+ * @since 12.0.2
+ */
+static VALUE
+rb_grn_data_column_missing_ignore_p(VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL((flags & GRN_OBJ_MISSING_MASK) == GRN_OBJ_MISSING_IGNORE);
+}
+
+/*
+ * @overload missing_nil?
+ * @return [Boolean] @true@ if the column uses @:nil@ missing mode.
+ * @since 12.0.2
+ */
+static VALUE
+rb_grn_data_column_missing_nil_p(VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL((flags & GRN_OBJ_MISSING_MASK) == GRN_OBJ_MISSING_NIL);
+}
+
+/*
+ * @overload invalid_mode
+ * @return [:error, :warn, :ignore] The invalid mode of the column.
+ * @since 12.0.2
+ */
+static VALUE
+rb_grn_data_column_get_invalid_mode(VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    switch ((flags & GRN_OBJ_INVALID_MASK)) {
+    case GRN_OBJ_INVALID_WARN:
+        return rb_id2sym(rb_intern("warn"));
+    case GRN_OBJ_INVALID_IGNORE:
+        return rb_id2sym(rb_intern("ignore"));
+    default:
+        return rb_id2sym(rb_intern("error"));
+    }
+}
+
+/*
+ * @overload invalid_error?
+ * @return [Boolean] @true@ if the column uses @:error@ invalid mode.
+ * @since 12.0.2
+ */
+static VALUE
+rb_grn_data_column_invalid_error_p(VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL((flags & GRN_OBJ_INVALID_MASK) == GRN_OBJ_INVALID_ERROR);
+}
+
+/*
+ * @overload invalid_warn?
+ * @return [Boolean] @true@ if the column uses @:warn@ invalid mode.
+ * @since 12.0.2
+ */
+static VALUE
+rb_grn_data_column_invalid_warn_p(VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL((flags & GRN_OBJ_INVALID_MASK) == GRN_OBJ_INVALID_WARN);
+}
+
+/*
+ * @overload invalid_ignore?
+ * @return [Boolean] @true@ if the column uses @:ignore@ invalid mode.
+ * @since 12.0.2
+ */
+static VALUE
+rb_grn_data_column_invalid_ignore_p(VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL((flags & GRN_OBJ_INVALID_MASK) == GRN_OBJ_INVALID_IGNORE);
+}
+
 void
 rb_grn_init_data_column (VALUE mGrn)
 {
@@ -255,6 +429,24 @@ rb_grn_init_data_column (VALUE mGrn)
     rb_define_method(rb_cGrnDataColumn, "apply_expression",
                      rb_grn_data_column_apply_expression, 0);
 
+    rb_define_method(rb_cGrnDataColumn, "missing_mode",
+                     rb_grn_data_column_get_missing_mode, 0);
+    rb_define_method(rb_cGrnDataColumn, "missing_add?",
+                     rb_grn_data_column_missing_add_p, 0);
+    rb_define_method(rb_cGrnDataColumn, "missing_ignore?",
+                     rb_grn_data_column_missing_ignore_p, 0);
+    rb_define_method(rb_cGrnDataColumn, "missing_nil?",
+                     rb_grn_data_column_missing_nil_p, 0);
+
+    rb_define_method(rb_cGrnDataColumn, "invalid_mode",
+                     rb_grn_data_column_get_invalid_mode, 0);
+    rb_define_method(rb_cGrnDataColumn, "invalid_error?",
+                     rb_grn_data_column_invalid_error_p, 0);
+    rb_define_method(rb_cGrnDataColumn, "invalid_warn?",
+                     rb_grn_data_column_invalid_warn_p, 0);
+    rb_define_method(rb_cGrnDataColumn, "invalid_ignore?",
+                     rb_grn_data_column_invalid_ignore_p, 0);
+
     rb_grn_init_fix_size_column(mGrn);
     rb_grn_init_variable_size_column(mGrn);
 }

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-2020  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2009-2022  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
@@ -21,53 +21,55 @@
 VALUE rb_cGrnRecordExpressionBuilder;
 VALUE rb_cGrnColumnExpressionBuilder;
 
+static ID id_build;
+static ID id_call;
+static ID id_new;
+
 VALUE
 rb_grn_record_expression_builder_new (VALUE table, VALUE name)
 {
     return rb_funcall(rb_cGrnRecordExpressionBuilder,
-                      rb_intern("new"), 2, table, name);
+                      id_new, 2, table, name);
 }
 
 VALUE
 rb_grn_column_expression_builder_new (VALUE column, VALUE name, VALUE query)
 {
     return rb_funcall(rb_cGrnColumnExpressionBuilder,
-                      rb_intern("new"), 3, column, name, query);
-}
-
-static VALUE
-build (VALUE self)
-{
-    return rb_funcall(self, rb_intern("build"), 0);
+                      id_new, 3, column, name, query);
 }
 
 static VALUE
 build_block (RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg))
 {
-    return rb_funcall(rb_block_proc(), rb_intern("call"), 1, yielded_arg);
+    return rb_funcall(rb_block_proc(), id_call, 1, yielded_arg);
 }
 
 VALUE
 rb_grn_record_expression_builder_build (VALUE self)
 {
     if (rb_block_given_p())
-        return rb_iterate(build, self, build_block, self);
+        return rb_block_call(self, id_build, 0, NULL, build_block, self);
     else
-        return build(self);
+        return rb_funcall(self, id_build, 0);
 }
 
 VALUE
 rb_grn_column_expression_builder_build (VALUE self)
 {
     if (rb_block_given_p())
-        return rb_iterate(build, self, build_block, self);
+        return rb_block_call(self, id_build, 0, NULL, build_block, self);
     else
-        return build(self);
+        return rb_funcall(self, id_build, 0);
 }
 
 void
 rb_grn_init_expression_builder (VALUE mGrn)
 {
+    id_build = rb_intern("build");
+    id_call = rb_intern("call");
+    id_new = rb_intern("new");
+
     rb_cGrnRecordExpressionBuilder =
         rb_const_get(mGrn, rb_intern("RecordExpressionBuilder"));
     rb_cGrnColumnExpressionBuilder =

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2021  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2009-2022  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
   Copyright (C) 2019  Horimoto Yasuhiro <horimoto@clear-code.com>
 
@@ -881,27 +881,6 @@ rb_grn_index_column_with_section_p (VALUE self)
     return CBOOL2RVAL(flags & GRN_OBJ_WITH_SECTION);
 }
 
-/*
- * _column_ がウェイト情報も格納する場合は +true+ を返します。
- *
- * @overload with_weight?
- */
-static VALUE
-rb_grn_index_column_with_weight_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_WITH_WEIGHT);
-}
-
 /*
  * _column_ が位置情報も格納する場合は +true+ を返します。
  *
@@ -1460,8 +1439,6 @@ rb_grn_init_index_column (VALUE mGrn)
 
     rb_define_method(rb_cGrnIndexColumn, "with_section?",
                      rb_grn_index_column_with_section_p, 0);
-    rb_define_method(rb_cGrnIndexColumn, "with_weight?",
-                     rb_grn_index_column_with_weight_p, 0);
     rb_define_method(rb_cGrnIndexColumn, "with_position?",
                      rb_grn_index_column_with_position_p, 0);
     rb_define_method(rb_cGrnIndexColumn, "small?",

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-2021  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2017-2022  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
@@ -56,6 +56,15 @@ static const rb_data_type_t rb_grn_inverted_index_cursor_type = {
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
+static VALUE
+rb_grn_inverted_index_cursor_alloc (VALUE klass)
+{
+    return TypedData_Wrap_Struct(klass,
+                                 &rb_grn_inverted_index_cursor_type,
+                                 NULL);
+}
+
+
 VALUE
 rb_grn_inverted_index_cursor_to_ruby_object (grn_ctx *context,
                                              grn_ii_cursor *cursor,
@@ -256,6 +265,8 @@ rb_grn_init_inverted_index_cursor (VALUE mGrn)
 {
     rb_cGrnInvertedIndexCursor =
       rb_define_class_under(mGrn, "InvertedIndexCursor", rb_cObject);
+    rb_define_alloc_func(rb_cGrnInvertedIndexCursor,
+                         rb_grn_inverted_index_cursor_alloc);
     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-2021  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2009-2022  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>
 
@@ -927,6 +927,30 @@ rb_grn_object_inspect_content_flags_with_label (VALUE inspected,
             rb_ary_push(inspected_flags, rb_str_new_cstr("COLUMN_SCALAR"));
         } else if (column_flags & GRN_OBJ_COLUMN_VECTOR) {
             rb_ary_push(inspected_flags, rb_str_new_cstr("COLUMN_VECTOR"));
+            if (column_flags & GRN_OBJ_WITH_WEIGHT)
+                rb_ary_push(inspected_flags, rb_str_new_cstr("WITH_WEIGHT"));
+            if (column_flags & GRN_OBJ_WEIGHT_FLOAT32)
+                rb_ary_push(inspected_flags, rb_str_new_cstr("WEIGHT_FLOAT32"));
+        }
+        switch (column_flags & GRN_OBJ_MISSING_MASK) {
+        case GRN_OBJ_MISSING_IGNORE:
+            rb_ary_push(inspected_flags, rb_str_new_cstr("MISSING_IGNORE"));
+            break;
+        case GRN_OBJ_MISSING_NIL:
+            rb_ary_push(inspected_flags, rb_str_new_cstr("MISSING_NIL"));
+            break;
+        default:
+            break;
+        }
+        switch (column_flags & GRN_OBJ_INVALID_MASK) {
+        case GRN_OBJ_INVALID_WARN:
+            rb_ary_push(inspected_flags, rb_str_new_cstr("INVALID_WARN"));
+            break;
+        case GRN_OBJ_INVALID_IGNORE:
+            rb_ary_push(inspected_flags, rb_str_new_cstr("INVALID_IGNORE"));
+            break;
+        default:
+            break;
         }
         break;
     default:

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-2021  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2016-2022  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
@@ -38,6 +38,12 @@ static rb_data_type_t data_type = {
     0
 };
 
+static VALUE
+rb_grn_request_timer_id_alloc (VALUE klass)
+{
+    return TypedData_Wrap_Struct(klass, &data_type, NULL);
+}
+
 void *
 rb_grn_request_timer_id_from_ruby_object (VALUE rb_id)
 {
@@ -61,4 +67,6 @@ rb_grn_init_request_timer_id (VALUE mGrn)
 {
     rb_cGrnRequestTimerID =
         rb_define_class_under(mGrn, "RequestTimerID", rb_cObject);
+    rb_define_alloc_func(rb_cGrnRequestTimerID,
+                         rb_grn_request_timer_id_alloc);
 }

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-2021  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2009-2022  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
@@ -344,7 +344,7 @@ rb_grn_table_key_support_get_key (VALUE self, VALUE rb_id)
     if (key_size == 0)
         return Qnil;
 
-    if (GRN_BULK_VSIZE(key) < key_size) {
+    if (GRN_BULK_VSIZE(key) < (size_t)key_size) {
         grn_bulk_reserve(context, key, key_size);
         grn_table_get_key(context, table, id, GRN_BULK_HEAD(key), key_size);
     }
@@ -540,7 +540,11 @@ rb_grn_table_key_support_array_set (VALUE self, VALUE rb_key, VALUE rb_values)
     data.id = id;
     data.table = table;
     data.rb_grn_object.context = context;
-    rb_iterate(rb_each, rb_values, set_value, (VALUE)&data);
+    {
+        ID id_each;
+        CONST_ID(id_each, "each");
+        rb_block_call(rb_values, id_each, 0, NULL, set_value, (VALUE)&data);
+    }
 
     return Qnil;
 }

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-2021  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2009-2022  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>
 
@@ -255,6 +255,36 @@ rb_grn_table_inspect (VALUE self)
  *     * `:lz4`: Compressed by LZ4.
  *     * `:zstd`: Compressed by Zstandard.
  *     * `:zstandard`: Compressed by Zstandard.
+ *   @option options :weight_float32 [Boolean] (false)
+ *     It specifies whether weight is stored as 32 bit float or not.
+ *
+ *     You can't use this option for scalar column.
+ *
+ *     @since 12.0.2
+ *   @option options [:add, :ignore, :nil, nil] :missing_mode (nil)
+ *     It specifies how to process missing value.
+ *
+ *     * `:add`, `nil`: Correspond to `MISSING_ADD`
+ *     * `:ignore`: Correspond to `MISSING_IGNORE`
+ *     * `:nil`: Correspond to `MISSING_NIL`
+ *
+ *     See
+ *     https://groonga.org/docs/reference/commands/column_create.html#column-create-missing-mode
+ *     for each `MISSING_*` values.
+ *
+ *     @since 12.0.2
+ *   @option options [:error, :warn, :ignore, nil] :invalid_mode (nil)
+ *     It specifies how to process invalid value.
+ *
+ *     * `:add`, `nil`: Correspond to `INVALID_ERROR`
+ *     * `:warn`: Correspond to `INVALID_WARN`
+ *     * `:ignore`: Correspond to `INVALID_IGNORE`
+ *
+ *     See
+ *     https://groonga.org/docs/reference/commands/column_create.html#column-create-invalid-mode
+ *     for each `INVALID_*` values.
+ *
+ *     @since 12.0.2
  *
  * @return [Groonga::FixSizeColumn, Groonga::VariableSizeColumn]
  */
@@ -269,6 +299,9 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
     grn_column_flags flags = 0;
     VALUE rb_name, rb_value_type;
     VALUE options, rb_path, rb_persistent, rb_compress, rb_type, rb_with_weight;
+    VALUE rb_weight_float32;
+    VALUE rb_missing_mode;
+    VALUE rb_invalid_mode;
     VALUE columns;
     VALUE rb_column;
 
@@ -288,6 +321,9 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
                         "type", &rb_type,
                         "with_weight", &rb_with_weight,
                         "compress", &rb_compress,
+                        "weight_float32", &rb_weight_float32,
+                        "missing_mode", &rb_missing_mode,
+                        "invalid_mode", &rb_invalid_mode,
                         NULL);
 
     value_type = RVAL2GRNOBJECT(rb_value_type, &context);
@@ -347,6 +383,43 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
                  rb_grn_inspect(rb_compress));
     }
 
+    if (RVAL2CBOOL(rb_weight_float32)) {
+        if (flags & GRN_OBJ_COLUMN_VECTOR) {
+            flags |= GRN_OBJ_WEIGHT_FLOAT32;
+        } else {
+            rb_raise(rb_eArgError,
+                     "can't use 32 bit float weight for scalar column");
+        }
+    }
+
+    if (NIL_P(rb_missing_mode) ||
+        rb_grn_equal_option(rb_missing_mode, "add")) {
+        flags |= GRN_OBJ_MISSING_ADD;
+    } else if (rb_grn_equal_option(rb_missing_mode, "ignore")) {
+        flags |= GRN_OBJ_MISSING_IGNORE;
+    } else if (rb_grn_equal_option(rb_missing_mode, "nil")) {
+        flags |= GRN_OBJ_MISSING_NIL;
+    } else {
+        rb_raise(rb_eArgError,
+                 "invalid missing mode: %s: "
+                 "available types: [:add, :ignore, :nil, nil]",
+                 rb_grn_inspect(rb_missing_mode));
+    }
+
+    if (NIL_P(rb_invalid_mode) ||
+        rb_grn_equal_option(rb_invalid_mode, "error")) {
+        flags |= GRN_OBJ_INVALID_ERROR;
+    } else if (rb_grn_equal_option(rb_invalid_mode, "warn")) {
+        flags |= GRN_OBJ_INVALID_WARN;
+    } else if (rb_grn_equal_option(rb_invalid_mode, "ignore")) {
+        flags |= GRN_OBJ_INVALID_IGNORE;
+    } else {
+        rb_raise(rb_eArgError,
+                 "invalid invalid mode: %s: "
+                 "available types: [:add, :warn, :ignore, nil]",
+                 rb_grn_inspect(rb_invalid_mode));
+    }
+
     column = grn_column_create(context, table, name, name_size,
                                path, flags, value_type);
     if (context->rc) {