rroonga 5.0.9 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec6c3b794a8d1a4e51430b65fbac2af82edb7e2
-  data.tar.gz: eaf0e7543c579f3d279d7dee8e31bd3ffcd80f33
+  metadata.gz: dd322f4e7d09549b297741d7844509cfdee161f8
+  data.tar.gz: 505a55c349328722cc84a66931082b63b3bea98c
 SHA512:
-  metadata.gz: a5c0b4c8a6cb3521cb3b8911a58adf1e3a5db700271dcdb92f73fc84a19f6df5e745afc30cb87cd5f7fe0ddab7b62606e39db02ad5a954062c8bdd822e2bde2b
-  data.tar.gz: e026c373a0d75f3f3acb3c6bf6191373985d15650a1712e02a113492de9bda6a679f8d9a32f9c8b74b40d377bf1490d299b41c579439a63df488847ec00b3d87
+  metadata.gz: f5603abe42c2c29c4ee01baf3852a60b4adfdc594a9f7776a4acdd3c84a2a51f45131dc6a8bfba8b2d127846e8a18ab2e8d27c0028ec8747d7b2d3685381ca61
+  data.tar.gz: 9c064d2e23eb9cd6bd53c3cf7b38baa6a69c2204973604c41717044fd12c4f213e1d1311b8f4f3758689f9ecd9ecb675a6ff17f3955688076a2c03e9c9a497a8

data/Rakefile

@@ -157,7 +157,7 @@ windows_architectures = [:x86, :x64]
 
 namespace :build do
   namespace :windows do
-    ruby_versions = "2.0.0:2.1.6:2.2.2"
+    ruby_versions = "2.0.0:2.1.6:2.2.2:2.3.0"
 
     windows_architectures.each do |architecture|
       desc "Build gem for Windows #{architecture}"
@@ -169,6 +169,7 @@ namespace :build do
         commands = [
           ["git", "clone", "file://#{Dir.pwd}/.git", build_dir],
           ["cd", build_dir],
+          ["gem", "install", "json"],
           ["bundle"],
           ["rake", "cross", "native", "gem", "RUBY_CC_VERSION=#{ruby_versions}"],
         ]

data/ext/groonga/{rb-grn-conf.c → rb-grn-config.c}

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2015-2016  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
@@ -21,7 +21,7 @@
 #define SELF(object) (RVAL2GRNCONTEXT(object))
 
 /*
- * Document-class: Groonga::Conf
+ * Document-class: Groonga::Config
  *
  * This class manages database global configurations. Each
  * configuration is key and value pair.
@@ -37,7 +37,7 @@
  * @since 5.0.9
  */
 static VALUE
-rb_grn_conf_initialize (VALUE self, VALUE rb_context)
+rb_grn_config_initialize (VALUE self, VALUE rb_context)
 {
     rb_iv_set(self, "@context", rb_context);
 
@@ -47,14 +47,14 @@ rb_grn_conf_initialize (VALUE self, VALUE rb_context)
 /*
  * Gets a configuration value for key.
  *
- * @overload conf[](key)
+ * @overload config[](key)
  *   @param [String] key The key.
  *   @return [String, nil] The value associated with `key`.
  *
  * @since 5.0.9
  */
 static VALUE
-rb_grn_conf_get (VALUE self, VALUE rb_key)
+rb_grn_config_get (VALUE self, VALUE rb_key)
 {
     VALUE rb_context;
     VALUE rb_value;
@@ -73,6 +73,8 @@ rb_grn_conf_get (VALUE self, VALUE rb_key)
 
     {
         grn_rc rc;
+        /* TODO: Replace it with grn_config_get() after Groonga 5.1.2
+         * is released.*/
         rc = grn_conf_get(context,
                           key, key_size,
                           &value, &value_size);
@@ -92,13 +94,13 @@ rb_grn_conf_get (VALUE self, VALUE rb_key)
 /*
  * Sets a configuration key and value pair.
  *
- * @overload conf[]=(key, value)
+ * @overload config[]=(key, value)
  *   @param [String] key The key.
  *   @param [String] value The value to be assigned.
  *   @return [String] `value`.
  */
 static VALUE
-rb_grn_conf_set (VALUE self, VALUE rb_key, VALUE rb_value)
+rb_grn_config_set (VALUE self, VALUE rb_key, VALUE rb_value)
 {
     VALUE rb_value_original = rb_value;
     VALUE rb_context;
@@ -121,6 +123,8 @@ rb_grn_conf_set (VALUE self, VALUE rb_key, VALUE rb_value)
 
     {
         grn_rc rc;
+        /* TODO: Replace it with grn_config_set() after Groonga 5.1.2
+         * is released.*/
         rc = grn_conf_set(context,
                           key, key_size,
                           value, value_size);
@@ -132,14 +136,15 @@ rb_grn_conf_set (VALUE self, VALUE rb_key, VALUE rb_value)
 }
 
 void
-rb_grn_init_conf (VALUE mGrn)
+rb_grn_init_config (VALUE mGrn)
 {
-    VALUE cGrnConf;
+    VALUE cGrnConfig;
 
-    cGrnConf = rb_define_class_under(mGrn, "Conf", rb_cObject);
+    cGrnConfig = rb_define_class_under(mGrn, "Config", rb_cObject);
+    rb_define_const(mGrn, "Conf", cGrnConfig);
 
-    rb_define_method(cGrnConf, "initialize", rb_grn_conf_initialize, 1);
+    rb_define_method(cGrnConfig, "initialize", rb_grn_config_initialize, 1);
 
-    rb_define_method(cGrnConf, "[]", rb_grn_conf_get, 1);
-    rb_define_method(cGrnConf, "[]=", rb_grn_conf_set, 2);
+    rb_define_method(cGrnConfig, "[]", rb_grn_config_get, 1);
+    rb_define_method(cGrnConfig, "[]=", rb_grn_config_set, 2);
 }

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

@@ -1,6 +1,7 @@
 /* -*- 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) 2016  Masafumi Yokoyama <yokoyama@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
@@ -623,6 +624,87 @@ rb_grn_database_unmap (VALUE self)
     return Qnil;
 }
 
+/*
+ * Recreates all index columns in the database.
+ *
+ * This method is useful when you have any broken index columns in
+ * the database. You don't need to specify each index column. But
+ * this method spends more time rather than you specify only reindex
+ * needed index columns.
+ *
+ * You can use {Groonga::TableKeySupport#reindex} to specify reindex
+ * target index columns in a table.
+ *
+ * You can use {Groonga::FixSizeColumn#reindex} or
+ * {Groonga::VariableSizeColumn#reindex} to specify reindex target
+ * index columns. They use index columns of the data column as
+ * reindex target index columns.
+ *
+ * You can use {Groonga::IndexColumn#reindex} to specify the reindex
+ * target index column.
+ *
+ * @example How to recreate all index columns in the database
+ *   database = Groonga::Database.create(:path => "/tmp/db")
+ *
+ *   Groonga::Schema.define do |schema|
+ *     schema.create_table("Memos") do |table|
+ *       table.short_text("title")
+ *       table.text("content")
+ *     end
+ *
+ *     schema.create_table("BigramTerms",
+ *                         :type => :patricia_trie,
+ *                         :key_type => :short_text,
+ *                         :normalizer => "NormalizerAuto",
+ *                         :default_tokenizer => "TokenBigram") do |table|
+ *       table.index("Memos.title")
+ *       table.index("Memos.content")
+ *     end
+ *
+ *     schema.create_table("MeCabTerms",
+ *                         :type => :patricia_trie,
+ *                         :key_type => :short_text,
+ *                         :normalizer => "NormalizerAuto",
+ *                         :default_tokenizer => "TokenMecab") do |table|
+ *       table.index("Memos.title")
+ *       table.index("Memos.content")
+ *     end
+ *   end
+ *
+ *   database.reindex
+ *   # They are called:
+ *   #   Groonga["BigramTerms.Memos_title"].reindex
+ *   #   Groonga["BigramTerms.Memos_content"].reindex
+ *   #   Groonga["MeCabTerms.Memos_title"].reindex
+ *   #   Groonga["MeCabTerms.Memos_content"].reindex
+ *
+ * @overload reindex
+ *   @return [void]
+ *
+ * @see Groonga::TableKeySupport#reindex
+ * @see Groonga::FixSizeColumn#reindex
+ * @see Groonga::VariableSizeColumn#reindex
+ * @see Groonga::IndexColumn#reindex
+ *
+ * @since 5.1.1
+ */
+static VALUE
+rb_grn_database_reindex (VALUE self)
+{
+    grn_rc rc;
+    grn_ctx *context;
+    grn_obj *database;
+
+    rb_grn_database_deconstruct(SELF(self), &database, &context,
+                                NULL, NULL, NULL, NULL);
+
+    rc = grn_obj_reindex(context, database);
+    rb_grn_context_check(context, self);
+    rb_grn_rc_check(rc, self);
+
+    return Qnil;
+}
+
 void
 rb_grn_init_database (VALUE mGrn)
 {
@@ -657,4 +739,5 @@ rb_grn_init_database (VALUE mGrn)
     rb_define_method(rb_cGrnDatabase, "defrag", rb_grn_database_defrag, -1);
     rb_define_method(rb_cGrnDatabase, "recover", rb_grn_database_recover, 0);
     rb_define_method(rb_cGrnDatabase, "unmap", rb_grn_database_unmap, 0);
+    rb_define_method(rb_cGrnDatabase, "reindex", rb_grn_database_reindex, 0);
 }

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

@@ -1,6 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
   Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2016  Masafumi Yokoyama <yokoyama@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
@@ -141,6 +142,87 @@ rb_grn_fix_size_column_decrement (int argc, VALUE *argv, VALUE self)
     return rb_grn_fix_size_column_integer_set(argc, argv, self, GRN_OBJ_DECR);
 }
 
+/*
+ * Recreates all index columns for the column.
+ *
+ * This method is useful when you have any broken index columns for
+ * the column. You don't need to specify each index column. But this
+ * method spends more time rather than you specify only reindex
+ * needed index columns.
+ *
+ * You can use {Groonga::Database#reindex} to recreate all index
+ * columns in a database.
+ *
+ * You can use {Groonga::TableKeySupport#reindex} to recreate all
+ * index columns in a table.
+ *
+ * You can use {Groonga::IndexColumn#reindex} to specify the reindex
+ * target index column.
+ *
+ * @example How to recreate all index columns for the column
+ *   Groonga::Schema.define do |schema|
+ *     schema.create_table("Users") do |table|
+ *       table.integer32("age")
+ *       table.integer32("score")
+ *     end
+ *
+ *     schema.create_table("Numbers",
+ *                         :type => :patricia_trie,
+ *                         :key_type => :integer32) do |table|
+ *       table.index("Users.age")
+ *       table.index("Users.score")
+ *     end
+ *
+ *     schema.create_table("Ages",
+ *                         :type => :patricia_trie,
+ *                         :key_type => :integer32) do |table|
+ *       table.index("Users.age")
+ *     end
+ *
+ *     schema.create_table("Scores",
+ *                         :type => :patricia_trie,
+ *                         :key_type => :integer32) do |table|
+ *       table.index("Users.score")
+ *     end
+ *   end
+ *
+ *   Groonga["Users.age"].reindex
+ *   # They are called:
+ *   #   Groonga["Numbers.Users_age"].reindex
+ *   #   Groonga["Ages.Users_age"].reindex
+ *   #
+ *   # They aren't called:
+ *   #   Groonga["Numbers.Users_score"].reindex
+ *   #   Groonga["Scores.Users_score"].reindex
+ *
+ * @overload reindex
+ *   @return [void]
+ *
+ * @see Groonga::Database#reindex
+ * @see Groonga::TableKeySupport#reindex
+ * @see Groonga::VariableSizeColumn#reindex
+ * @see Groonga::IndexColumn#reindex
+ *
+ * @since 5.1.1
+ */
+static VALUE
+rb_grn_fix_size_column_reindex (VALUE self)
+{
+    grn_rc rc;
+    grn_ctx *context;
+    grn_obj *column;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+
+    rc = grn_obj_reindex(context, column);
+    rb_grn_context_check(context, self);
+    rb_grn_rc_check(rc, self);
+
+    return Qnil;
+}
+
 void
 rb_grn_init_fix_size_column (VALUE mGrn)
 {
@@ -156,4 +238,7 @@ rb_grn_init_fix_size_column (VALUE mGrn)
                      rb_grn_fix_size_column_increment, -1);
     rb_define_method(rb_cGrnFixSizeColumn, "decrement!",
                      rb_grn_fix_size_column_decrement, -1);
+
+    rb_define_method(rb_cGrnFixSizeColumn, "reindex",
+                     rb_grn_fix_size_column_reindex, 0);
 }

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

@@ -1,6 +1,7 @@
 /* -*- 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) 2016  Masafumi Yokoyama <yokoyama@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
@@ -1187,6 +1188,84 @@ rb_grn_index_column_estimate_size (int argc, VALUE *argv, VALUE self)
     return UINT2NUM(size);
 }
 
+/*
+ * Recreates the index column.
+ *
+ * This method is useful when you have a broken index column.
+ *
+ * You can use {Groonga::Database#reindex} to recreate all index
+ * columns in a database.
+ *
+ * You can use {Groonga::TableKeySupport#reindex} to recreate all
+ * index columns in a table.
+ *
+ * You can use {Groonga::FixSizeColumn#reindex} or
+ * {Groonga::VariableSizeColumn#reindex} to recreate all index
+ * columns. They use index columns of the data column as
+ * reindex target index columns.
+ *
+ * @example How to recreate the index column.
+ *   Groonga::Schema.define do |schema|
+ *     schema.create_table("Memos") do |table|
+ *       table.short_text("title")
+ *       table.text("content")
+ *     end
+ *
+ *     schema.create_table("BigramTerms",
+ *                         :type => :patricia_trie,
+ *                         :key_type => :short_text,
+ *                         :normalizer => "NormalizerAuto",
+ *                         :default_tokenizer => "TokenBigram") do |table|
+ *       table.index("Memos.title")
+ *       table.index("Memos.content")
+ *     end
+ *
+ *     schema.create_table("MeCabTerms",
+ *                         :type => :patricia_trie,
+ *                         :key_type => :short_text,
+ *                         :normalizer => "NormalizerAuto",
+ *                         :default_tokenizer => "TokenMecab") do |table|
+ *       table.index("Memos.title")
+ *       table.index("Memos.content")
+ *     end
+ *   end
+ *
+ *   Groonga["MeCabTerms.Memos_content"].reindex
+ *   # They aren't called:
+ *   #   Groonga["BigramTerms.Memos_title"].reindex
+ *   #   Groonga["BigramTerms.Memos_content"].reindex
+ *   #   Groonga["MeCabTerms.Memos_title"].reindex
+ *
+ * @overload reindex
+ *   @return [void]
+ *
+ * @see Groonga::Database#reindex
+ * @see Groonga::TableKeySupport#reindex
+ * @see Groonga::FixSizeColumn#reindex
+ * @see Groonga::VariableSizeColumn#reindex
+ *
+ * @since 5.1.1
+ */
+static VALUE
+rb_grn_index_column_reindex (VALUE self)
+{
+    grn_rc rc;
+    grn_ctx *context;
+    grn_obj *column;
+
+    rb_grn_index_column_deconstruct(SELF(self), &column, &context,
+                                    NULL, NULL,
+                                    NULL, NULL, NULL,
+                                    NULL, NULL,
+                                    NULL, NULL);
+
+    rc = grn_obj_reindex(context, column);
+    rb_grn_context_check(context, self);
+    rb_grn_rc_check(rc, self);
+
+    return Qnil;
+}
+
 void
 rb_grn_init_index_column (VALUE mGrn)
 {
@@ -1225,4 +1304,7 @@ rb_grn_init_index_column (VALUE mGrn)
 
     rb_define_method(rb_cGrnIndexColumn, "estimate_size",
                      rb_grn_index_column_estimate_size, -1);
+
+    rb_define_method(rb_cGrnIndexColumn, "reindex",
+                     rb_grn_index_column_reindex, 0);
 }

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

@@ -1,7 +1,7 @@
 /* -*- 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) 2014-2015  Masafumi Yokoyama <yokoyama@clear-code.com>
+  Copyright (C) 2014-2016  Masafumi Yokoyama <yokoyama@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
@@ -1656,6 +1656,68 @@ rb_grn_object_scorer_procedure_p (VALUE self)
     return CBOOL2RVAL(scorer_procedure_p);
 }
 
+/*
+ * Checks whether the object is accessor or not.
+ *
+ * @overload accessor?
+ *   @return [Boolean] `true` if the object is accessor,
+ *     `false` otherwise.
+ *
+ * @since 5.1.1
+ */
+static VALUE
+rb_grn_object_accessor_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    grn_bool accessor_p = GRN_FALSE;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+
+    if (context && object) {
+        accessor_p = grn_obj_is_accessor(context, object);
+    }
+
+    return CBOOL2RVAL(accessor_p);
+}
+
+/*
+ * Checks whether the object is key accessor 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)
+ *   users = Groonga["Users"]
+ *   users.column("_key").key_accessor? # => true
+ *
+ * @example `false` case: `column("_id")` is an accessor but it's not an accessor for `_key`
+ *   Groonga::Schema.create_table("Users", :key_type => :short_text)
+ *   users = Groonga["Users"]
+ *   users.column("_id").key_accessor? # => false
+ *
+ * @overload key_accessor?
+ *   @return [Boolean] `true` if the object is key accessor,
+ *     `false` otherwise.
+ *
+ * @since 5.1.1
+ */
+static VALUE
+rb_grn_object_key_accessor_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    grn_bool key_accessor_p = GRN_FALSE;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+
+    if (context && object) {
+        key_accessor_p = grn_obj_is_key_accessor(context, object);
+    }
+
+    return CBOOL2RVAL(key_accessor_p);
+}
+
 void
 rb_grn_init_object (VALUE mGrn)
 {
@@ -1701,4 +1763,8 @@ rb_grn_init_object (VALUE mGrn)
                      rb_grn_object_selector_only_procedure_p, 0);
     rb_define_method(rb_cGrnObject, "scorer_procedure?",
                      rb_grn_object_scorer_procedure_p, 0);
+    rb_define_method(rb_cGrnObject, "accessor?",
+                     rb_grn_object_accessor_p, 0);
+    rb_define_method(rb_cGrnObject, "key_accessor?",
+                     rb_grn_object_key_accessor_p, 0);
 }