rroonga 5.0.9 → 5.1.1

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

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
   Copyright (C) 2009-2014  Kouhei Sutou <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
   modify it under the terms of the GNU Lesser General Public
@@ -1025,6 +1025,89 @@ rb_grn_table_key_support_tokenize (int argc, VALUE *argv, VALUE self)
     return rb_tokens;
 }
 
+/*
+ * Recreates all index columns in the table.
+ *
+ * This method is useful when you have any broken index columns in
+ * the table. 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::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 table
+ *   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["BigramTerms"].reindex
+ *   # They are called:
+ *   #   Groonga["BigramTerms.Memos_title"].reindex
+ *   #   Groonga["BigramTerms.Memos_content"].reindex
+ *   #
+ *   # They aren't called:
+ *   #   Groonga["MeCabTerms.Memos_title"].reindex
+ *   #   Groonga["MeCabTerms.Memos_content"].reindex
+ *
+ * @overload reindex
+ *   @return [void]
+ *
+ * @see Groonga::Database#reindex
+ * @see Groonga::FixSizeColumn#reindex
+ * @see Groonga::VariableSizeColumn#reindex
+ * @see Groonga::IndexColumn#reindex
+ *
+ * @since 5.1.1
+ */
+static VALUE
+rb_grn_table_key_support_reindex (VALUE self)
+{
+    grn_rc rc;
+    grn_ctx *context;
+    grn_obj *table;
+
+    rb_grn_table_key_support_deconstruct(SELF(self), &table, &context,
+                                         NULL, NULL, NULL,
+                                         NULL, NULL, NULL,
+                                         NULL);
+
+    rc = grn_obj_reindex(context, table);
+    rb_grn_context_check(context, self);
+    rb_grn_rc_check(rc, self);
+
+    return Qnil;
+}
+
 void
 rb_grn_init_table_key_support (VALUE mGrn)
 {
@@ -1084,4 +1167,7 @@ rb_grn_init_table_key_support (VALUE mGrn)
 
     rb_define_method(rb_mGrnTableKeySupport, "tokenize",
                      rb_grn_table_key_support_tokenize, -1);
+
+    rb_define_method(rb_mGrnTableKeySupport, "reindex",
+                     rb_grn_table_key_support_reindex, 0);
 }

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

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2014-2015  Masafumi Yokoyama <yokoyama@clear-code.com>
   Copyright (C) 2009-2015  Kouhei Sutou <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
   modify it under the terms of the GNU Lesser General Public
@@ -1376,7 +1376,7 @@ rb_grn_table_geo_sort (int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "21", &rb_column, &rb_base_geo_point, &rb_options);
 
-    column = RVAL2GRNCOLUMN(rb_column, &context);
+    column = RVAL2GRNOBJECT(rb_column, &context);
     column_range_id = grn_obj_get_range(context, column);
     switch (column_range_id) {
     case GRN_DB_TOKYO_GEO_POINT:

data/ext/groonga/rb-grn-variable-size-column.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  Masafumi Yokoyama <myokoym@gmail.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
@@ -564,6 +564,86 @@ rb_grn_variable_size_column_defrag (int argc, VALUE *argv, VALUE self)
     return INT2NUM(n_segments);
 }
 
+/*
+ * 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("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["Memos.content"].reindex
+ *   # They are called:
+ *   #   Groonga["BigramTerms.Memos_content"].reindex
+ *   #   Groonga["MeCabTerms.Memos_content"].reindex
+ *   #
+ *   # They aren't called:
+ *   #   Groonga["BigramTerms.Memos_title"].reindex
+ *   #   Groonga["MeCabTerms.Memos_title"].reindex
+ *
+ * @overload reindex
+ *   @return [void]
+ *
+ * @see Groonga::Database#reindex
+ * @see Groonga::TableKeySupport#reindex
+ * @see Groonga::FixSizeColumn#reindex
+ * @see Groonga::IndexColumn#reindex
+ *
+ * @since 5.1.1
+ */
+static VALUE
+rb_grn_variable_size_column_reindex (VALUE self)
+{
+    grn_rc rc;
+    grn_ctx *context;
+    grn_obj *column;
+
+    rb_grn_variable_size_column_deconstruct(SELF(self), &column, &context,
+                                            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_variable_size_column (VALUE mGrn)
 {
@@ -579,4 +659,7 @@ rb_grn_init_variable_size_column (VALUE mGrn)
                      rb_grn_variable_size_column_compressed_p, -1);
     rb_define_method(rb_cGrnVariableSizeColumn, "defrag",
                      rb_grn_variable_size_column_defrag, -1);
+
+    rb_define_method(rb_cGrnVariableSizeColumn, "reindex",
+                     rb_grn_variable_size_column_reindex, 0);
 }

data/ext/groonga/rb-grn.h

@@ -1,7 +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) 2009-2015  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2015-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
@@ -100,8 +100,8 @@ RB_GRN_BEGIN_DECLS
 #endif
 
 #define RB_GRN_MAJOR_VERSION 5
-#define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 9
+#define RB_GRN_MINOR_VERSION 1
+#define RB_GRN_MICRO_VERSION 1
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -354,7 +354,7 @@ void           rb_grn_init_snippet                  (VALUE mGrn);
 void           rb_grn_init_plugin                   (VALUE mGrn);
 void           rb_grn_init_normalizer               (VALUE mGrn);
 void           rb_grn_init_thread                   (VALUE mGrn);
-void           rb_grn_init_conf                     (VALUE mGrn);
+void           rb_grn_init_config                   (VALUE mGrn);
 
 VALUE          rb_grn_rc_to_exception               (grn_rc rc);
 const char    *rb_grn_rc_to_message                 (grn_rc rc);

data/ext/groonga/rb-groonga.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
@@ -148,6 +149,30 @@ rb_grn_init_lock_timeout (VALUE mGrn)
                                rb_grn_s_set_lock_timeout, 1);
 }
 
+/*
+ * Returns the Groonga package's label. It's `"Groonga"`.
+ *
+ * @example How to get the Groonga package's label
+ *   Groonga.package_label # => "Groonga"
+ *
+ * @overload package_label
+ *   @return [String] `"Groonga"`
+ *
+ * @since 5.1.1
+ */
+static VALUE
+rb_grn_s_get_package_label (VALUE klass)
+{
+    return rb_str_new_cstr(grn_get_package_label());
+}
+
+static void
+rb_grn_init_package_label (VALUE mGrn)
+{
+    rb_define_singleton_method(mGrn, "package_label",
+                               rb_grn_s_get_package_label, 0);
+}
+
 void
 Init_groonga (void)
 {
@@ -162,6 +187,7 @@ Init_groonga (void)
 
     rb_grn_init_version(mGrn);
     rb_grn_init_lock_timeout(mGrn);
+    rb_grn_init_package_label(mGrn);
 
     rb_grn_init_utils(mGrn);
     rb_grn_init_encoding(mGrn);
@@ -192,5 +218,5 @@ Init_groonga (void)
     rb_grn_init_plugin(mGrn);
     rb_grn_init_normalizer(mGrn);
     rb_grn_init_thread(mGrn);
-    rb_grn_init_conf(mGrn);
+    rb_grn_init_config(mGrn);
 }

data/lib/groonga/context.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2010-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-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
@@ -347,12 +347,21 @@ module Groonga
       memory_pool.register(object)
     end
 
-    # @return [Groonga::Conf] The database level configuration sets of
+    # @return [Groonga::Config] The database level configuration sets of
     #   this context.
     #
     # @since 5.0.9
+    # @deprecated since 5.1.1. Use {Groonga::Context#config} instead.
     def conf
-      @conf ||= Conf.new(self)
+      config
+    end
+
+    # @return [Groonga::Config] The database level configuration sets of
+    #   this context.
+    #
+    # @since 5.1.1
+    def config
+      @config ||= Config.new(self)
     end
   end
 end

data/lib/groonga/expression-builder.rb

@@ -81,7 +81,8 @@ module Groonga
       end
 
       if builders.empty?
-        expression.append_constant(true)
+        expression.append_object(@table.context["all_records"])
+        expression.append_operation(Operation::CALL, 0)
       else
         combined_builder = builders.inject(nil) do |previous, builder|
           if previous.nil?

data/rroonga-build.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 # Copyright (C) 2009-2015  Kouhei Sutou <kou@clear-code.com>
-# Copyright (C) 2015  Masafumi Yokoyama <yokoyama@clear-code.com>
+# Copyright (C) 2015-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
@@ -19,16 +19,16 @@
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 5
-    MINOR = 0
-    MICRO = 9
+    MINOR = 1
+    MICRO = 0
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2015, 10, 29)
+    RELEASED_DATE = Time.utc(2015, 11, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 5
-    MINOR = 0
-    MICRO = 9
+    MINOR = 1
+    MICRO = 1
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-accessor.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2011  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
@@ -33,4 +34,33 @@ class AccessorTest < Test::Unit::TestCase
   def test_local_name
     assert_equal("_id", @id.local_name)
   end
+
+  sub_test_case "#accessor?" do
+    test "true" do
+      assert do
+        @id.accessor?
+      end
+    end
+
+    test "false" do
+      assert do
+        not @posts.accessor?
+      end
+    end
+  end
+
+  sub_test_case "#key_accessor?" do
+    test "true" do
+      key = @posts.column("_key")
+      assert do
+        key.key_accessor?
+      end
+    end
+
+    test "false" do
+      assert do
+        not @id.key_accessor?
+      end
+    end
+  end
 end

data/test/{test-conf.rb → test-config.rb}

@@ -1,4 +1,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
@@ -13,19 +13,19 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-class ConfTest < Test::Unit::TestCase
+class ConfigTest < Test::Unit::TestCase
   include GroongaTestUtils
 
   setup :setup_database
 
   sub_test_case "#[]" do
     test "existent" do
-      context.conf["rroonga.key"] = "value"
-      assert_equal("value", context.conf["rroonga.key"])
+      context.config["rroonga.key"] = "value"
+      assert_equal("value", context.config["rroonga.key"])
     end
 
     test "nonexistent" do
-      assert_nil(context.conf["nonexistent"])
+      assert_nil(context.config["nonexistent"])
     end
   end
 end