rroonga 5.1.1 → 6.0.0

data/ext/groonga/rb-grn.h

@@ -21,10 +21,8 @@
 #define __RB_GRN_H__
 
 #include <ruby.h>
+#include <ruby/encoding.h>
 
-#ifdef HAVE_RUBY_ENCODING_H
-#  include <ruby/encoding.h>
-#endif
 #ifdef HAVE_RUBY_INTERN_H
 #  include <ruby/intern.h>
 #endif
@@ -99,9 +97,9 @@ RB_GRN_BEGIN_DECLS
 #  define debug(...)
 #endif
 
-#define RB_GRN_MAJOR_VERSION 5
-#define RB_GRN_MINOR_VERSION 1
-#define RB_GRN_MICRO_VERSION 1
+#define RB_GRN_MAJOR_VERSION 6
+#define RB_GRN_MINOR_VERSION 0
+#define RB_GRN_MICRO_VERSION 0
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -301,6 +299,7 @@ RB_GRN_VAR VALUE rb_cGrnRecordExpressionBuilder;
 RB_GRN_VAR VALUE rb_cGrnColumnExpressionBuilder;
 RB_GRN_VAR VALUE rb_cGrnPlugin;
 RB_GRN_VAR VALUE rb_cGrnNormalizer;
+RB_GRN_VAR VALUE rb_cGrnIndex;
 
 void           rb_grn_init_utils                    (VALUE mGrn);
 void           rb_grn_init_exception                (VALUE mGrn);
@@ -355,6 +354,7 @@ 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_config                   (VALUE mGrn);
+void           rb_grn_init_index                    (VALUE mGrn);
 
 VALUE          rb_grn_rc_to_exception               (grn_rc rc);
 const char    *rb_grn_rc_to_message                 (grn_rc rc);
@@ -383,7 +383,6 @@ void           rb_grn_context_object_created        (VALUE rb_context,
                                                      VALUE rb_object);
 
 const char    *rb_grn_inspect                       (VALUE object);
-const char    *rb_grn_inspect_type                  (unsigned char type);
 void           rb_grn_scan_options                  (VALUE options, ...)
                                                      RB_GRN_GNUC_NULL_TERMINATED;
 grn_bool       rb_grn_equal_option                  (VALUE option,
@@ -634,6 +633,9 @@ VALUE          rb_grn_column_expression_builder_new (VALUE column,
 VALUE          rb_grn_column_expression_builder_build
                                                     (VALUE self);
 
+VALUE          rb_grn_index_new                     (VALUE rb_index_column,
+                                                     VALUE rb_section);
+
 
 #define RB_GRN_INTERN(c_string)       (rb_to_symbol(rb_str_new_cstr(c_string)))
 
@@ -740,11 +742,9 @@ VALUE          rb_grn_column_expression_builder_build
 grn_encoding   rb_grn_encoding_from_ruby_object     (VALUE object,
                                                      grn_ctx *context);
 VALUE          rb_grn_encoding_to_ruby_object       (grn_encoding encoding);
-#ifdef HAVE_RUBY_ENCODING_H
 rb_encoding   *rb_grn_encoding_to_ruby_encoding     (grn_encoding encoding);
 VALUE          rb_grn_encoding_to_ruby_encoding_object
                                                     (grn_encoding encoding);
-#endif
 
 grn_ctx       *rb_grn_context_from_ruby_object      (VALUE object);
 VALUE          rb_grn_context_to_ruby_object        (grn_ctx *context);

data/ext/groonga/rb-groonga.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-2016  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
@@ -30,6 +30,34 @@ finish_groonga (VALUE data)
     debug("finish: done\n");
 }
 
+/*
+ * @overload error_message
+ *   @return [String, nil] The process global error message.
+ *
+ * @since 6.0.0
+ */
+static VALUE
+rb_grn_s_get_error_message (VALUE klass)
+{
+    const char *message;
+
+    message = grn_get_global_error_message();
+    if (message[0] == '\0') {
+        return Qnil;
+    } else {
+        grn_encoding encoding = grn_get_default_encoding();
+        return rb_enc_str_new_cstr(message,
+                                   rb_grn_encoding_to_ruby_encoding(encoding));
+    }
+}
+
+static void
+rb_grn_init_error_message (VALUE mGrn)
+{
+    rb_define_singleton_method(mGrn, "error_message",
+                               rb_grn_s_get_error_message, 0);
+}
+
 static void
 rb_grn_init_runtime_version (VALUE mGrn)
 {
@@ -180,6 +208,7 @@ Init_groonga (void)
 
     mGrn = rb_define_module("Groonga");
 
+    rb_grn_init_error_message(mGrn);
     rb_grn_init_exception(mGrn);
 
     rb_grn_rc_check(grn_init(), Qnil);
@@ -219,4 +248,5 @@ Init_groonga (void)
     rb_grn_init_normalizer(mGrn);
     rb_grn_init_thread(mGrn);
     rb_grn_init_config(mGrn);
+    rb_grn_init_index(mGrn);
 }

data/lib/groonga/column.rb

@@ -21,5 +21,18 @@ module Groonga
       measurer = StatisticMeasurer.new
       measurer.measure_disk_usage(path)
     end
+
+    # @param [Groonga::Operator] operator (Groonga::Operator::MATCH)
+    # @return [Array<Groonga::IndexColumn>] Indexes on `column` which can
+    #    execute `operator`.
+    # @since 1.0.9
+    #
+    # @deprecated since 6.0.0. Use {Groonga::Column#find_indexes} instead.
+    def indexes(operator=nil)
+      operator ||= Operator::MATCH
+      find_indexes(:operator => operator).collect do |index|
+        index.column
+      end
+    end
   end
 end

data/lib/groonga/dumper.rb

@@ -666,6 +666,7 @@ module Groonga
       @have_output = !@output.nil?
       @output ||= Dumper.default_output
       @error_output = @options[:error_output]
+      @max_records = @options[:max_records]
     end
 
     def dump
@@ -709,7 +710,8 @@ module Groonga
       when Groonga::Array, Groonga::Hash
         order_by = nil if order_by == :key
       end
-      @table.each(:order_by => order_by) do |record|
+      limit = @options[:max_records]
+      @table.each(:order_by => order_by, :limit => limit) do |record|
         write(",\n")
         values = columns.collect do |column|
           resolve_value(record, column, column[record.id])

data/lib/groonga/expression-builder.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # 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>
 #
 # 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,10 @@ module Groonga
       other
     end
 
+    def -(other)
+      other
+    end
+
     private
     def default_parse_options
       {
@@ -110,6 +114,10 @@ module Groonga
       def |(other)
         OrExpressionBuilder.new(self, other)
       end
+
+      def -(other)
+        AndNotExpressionBuilder.new(self, other)
+      end
     end
 
     # @private
@@ -143,6 +151,13 @@ module Groonga
       end
     end
 
+    # @private
+    class AndNotExpressionBuilder < SetExpressionBuilder
+      def initialize(*expression_builders)
+        super(Groonga::Operation::AND_NOT, *expression_builders)
+      end
+    end
+
     # @private
     class ColumnValueExpressionBuilder < ExpressionBuilder
       def initialize(column, options={})
@@ -168,6 +183,10 @@ module Groonga
         EqualExpressionBuilder.new(self, normalize(other))
       end
 
+      def !=(other)
+        NotEqualExpressionBuilder.new(self, normalize(other))
+      end
+
       def =~(other)
         if other.nil?
           full_column_name = "#{@table.name}.#{@column_name}"
@@ -249,25 +268,45 @@ module Groonga
 
       private
       def normalize(other)
-        if @range.is_a?(Groonga::Table)
-          if other.respond_to?(:record_id)
-            id = other.record_id
-          else
-            id = other
-          end
-          return Groonga::Record.new(@range, id) if id.is_a?(Integer)
+        return other unless @range.is_a?(Table)
+        return other if other.is_a?(Record)
+
+        if other.respond_to?(:record_raw_id)
+          return Record.new(@range, other.record_raw_id)
         end
+
+        if other.respond_to?(:record_id)
+          return @range[other.record_id]
+        end
+
         other
       end
 
+      def callable_object?(object)
+        return false unless object.respond_to?(:function_procedure?)
+
+        object.function_procedure?
+      end
+
       def method_missing(name, *args, &block)
         return super if block
-        return super unless args.empty?
-        if VALID_COLUMN_NAME_RE =~ name.to_s
-          RecordExpressionBuilder.new(@table, @name)["#{@column_name}.#{name}"]
-        else
-          super
+
+        if args.empty? and VALID_COLUMN_NAME_RE =~ name.to_s
+          accessor_name = "#{@column_name}.#{name}"
+          accessor = @table.column(accessor_name)
+          if accessor
+            return self.class.new(accessor,
+                                  :table => @table,
+                                  :column_name => accessor_name)
+          end
+        end
+
+        object = @table.context[name]
+        if callable_object?(object)
+          return CallExpressionBuilder.new(object, self, *args)
         end
+
+        super
       end
     end
 
@@ -331,6 +370,13 @@ module Groonga
       end
     end
 
+    # @private
+    class NotEqualExpressionBuilder < BinaryExpressionBuilder
+      def initialize(column_value_builder, value)
+        super(Groonga::Operation::NOT_EQUAL, column_value_builder, value)
+      end
+    end
+
     # @private
     class MatchExpressionBuilder < BinaryExpressionBuilder
       def initialize(column_value_builder, value)
@@ -461,8 +507,10 @@ module Groonga
         expression.append_object(@function)
         @arguments.each do |argument|
           case argument
-          when String
+          when String, Integer, Time
             expression.append_constant(argument)
+          when ::Hash
+            expression.append_object(argument)
           else
             argument.build(expression, variable)
           end
@@ -595,6 +643,10 @@ module Groonga
       column_expression_builder == other
     end
 
+    def !=(other)
+      column_expression_builder != other
+    end
+
     def =~(other)
       column_expression_builder =~ other
     end
@@ -666,7 +718,3 @@ module Groonga
     end
   end
 end
-
-if RUBY_VERSION >= "1.9"
-  require "groonga/expression-builder-19"
-end

data/lib/groonga/{expression-builder-19.rb → index.rb}

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 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
@@ -16,25 +14,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Groonga
-  module ExpressionBuildable
-    class ColumnValueExpressionBuilder
-      def !=(other)
-        NotEqualExpressionBuilder.new(self, normalize(other))
-      end
-    end
+  class Index
+    attr_reader :column
+    attr_reader :section
 
-    # @private
-    class NotEqualExpressionBuilder < BinaryExpressionBuilder
-      def initialize(column_value_builder, value)
-        super(Groonga::Operation::NOT_EQUAL, column_value_builder, value)
-      end
+    def initialize(column, section)
+      @column = column
+      @section = section
     end
-  end
 
-  # @private
-  class ColumnExpressionBuilder
-    def !=(other)
-      column_value_builder != other
+    def ==(other)
+      other.is_a?(self.class) and
+        @column == other.column and
+        @section == other.section
     end
   end
 end

data/lib/groonga/record.rb

@@ -400,7 +400,7 @@ module Groonga
     end
 
     # @private
-    def respond_to?(name)
+    def respond_to?(name, include_all=false)
       super or !@table.column(name.to_s.sub(/=\z/, '')).nil?
     end
 

data/lib/groonga.rb

@@ -38,6 +38,7 @@ require "groonga/geo-point"
 require "groonga/record"
 require "groonga/expression-builder"
 require "groonga/posting"
+require "groonga/index"
 begin
   major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/groonga.so"

data/lib/rroonga.rb

@@ -0,0 +1,16 @@
+# Copyright (C) 2016  Fumiaki MATSUSHIMA <mtsmfm@gmail.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "groonga"

data/rroonga-build.rb

@@ -18,17 +18,17 @@
 
 module RroongaBuild
   module RequiredGroongaVersion
-    MAJOR = 5
-    MINOR = 1
+    MAJOR = 6
+    MINOR = 0
     MICRO = 0
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2015, 11, 29)
+    RELEASED_DATE = Time.utc(2016, 2, 29)
   end
 
   module LatestGroongaVersion
-    MAJOR = 5
-    MINOR = 1
-    MICRO = 1
+    MAJOR = 6
+    MINOR = 0
+    MICRO = 0
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/rroonga.gemspec

@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
   s.summary, s.description, = description.split(/\n\n+/, 3)
 
   s.files = ["README.md", "AUTHORS", "Rakefile", "Gemfile", ".yardopts"]
-  s.files += Dir.glob("doc/text/*.textile")
+  s.files += Dir.glob("doc/text/*.md")
   s.files += Dir.glob("doc/images/*")
   s.files += ["#{s.name}.gemspec"]
   s.files += ["rroonga-build.rb", "extconf.rb"]

data/test/groonga-test-utils.rb

@@ -158,14 +158,6 @@ module GroongaTestUtils
                  actual.expression.inspect)
   end
 
-  def ruby19?
-    RUBY_VERSION >= "1.9"
-  end
-
-  def only_ruby19
-    omit("Ruby 1.9 is needed.") unless ruby19?
-  end
-
   def linux?
     /linux/ =~ RUBY_PLATFORM
   end

data/test/test-column.rb

@@ -1,4 +1,5 @@
-# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2016  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
@@ -584,4 +585,109 @@ class ColumnTest < Test::Unit::TestCase
       assert_equal(["title1"], select.call)
     end
   end
+
+  class FindIndexesTest < self
+    class NoOperatorTest < self
+      def setup
+        super
+        Groonga::Schema.define do |schema|
+          schema.create_table("Comments") do |table|
+            table.short_text("title")
+            table.short_text("body")
+          end
+        end
+        @title = Groonga["Comments.title"]
+      end
+
+      def test_nothing
+        assert_equal([], @title.find_indexes)
+      end
+
+      def test_one_index
+        Groonga::Schema.define do |schema|
+          schema.create_table("Terms",
+                              :type => :patricia_trie,
+                              :key_type => :short_text,
+                              :default_tokenizer => "TokenBigram") do |table|
+            table.index("Comments.title")
+          end
+        end
+        assert_equal([
+                       Groonga::Index.new(Groonga["Terms.Comments_title"], 0),
+                     ],
+                     @title.find_indexes)
+      end
+
+      def test_multiple_indexes
+        Groonga::Schema.define do |schema|
+          schema.create_table("Terms",
+                              :type => :patricia_trie,
+                              :key_type => :short_text,
+                              :default_tokenizer => "TokenBigram") do |table|
+            table.index("Comments.title")
+          end
+
+          schema.create_table("Titles",
+                              :type => :hash,
+                              :key_type => :short_text) do |table|
+            table.index("Comments.title")
+          end
+        end
+        assert_equal([
+                       Groonga::Index.new(Groonga["Terms.Comments_title"], 0),
+                       Groonga::Index.new(Groonga["Titles.Comments_title"], 0),
+                     ],
+                     @title.find_indexes.sort_by {|index| index.column.name})
+      end
+
+      def test_multiple_column_index
+        Groonga::Schema.define do |schema|
+          schema.create_table("Terms",
+                              :type => :patricia_trie,
+                              :default_tokenizer => "TokenBigram") do |table|
+            table.index("Comments", "body", "title",
+                        :name => "comments")
+          end
+        end
+        assert_equal([
+                       Groonga::Index.new(Groonga["Terms.comments"], 2),
+                     ],
+                     @title.find_indexes)
+      end
+    end
+
+    class OperatorTest < self
+      def setup
+        super
+        Groonga::Schema.define do |schema|
+          schema.create_table("Comments") do |table|
+            table.short_text("title")
+            table.short_text("body")
+          end
+        end
+        @title = Groonga["Comments.title"]
+      end
+
+      def test_equal
+        Groonga::Schema.define do |schema|
+          schema.create_table("Terms",
+                              :type => :patricia_trie,
+                              :key_type => :short_text,
+                              :default_tokenizer => "TokenBigram") do |table|
+            table.index("Comments.title")
+          end
+
+          schema.create_table("Titles",
+                              :type => :patricia_trie,
+                              :key_type => :short_text) do |table|
+            table.index("Comments.title")
+          end
+        end
+        assert_equal([
+                       Groonga::Index.new(Groonga["Titles.Comments_title"], 0),
+                     ],
+                     @title.find_indexes(:operator => :equal))
+      end
+    end
+  end
 end

data/test/test-config.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2015-2016  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
@@ -28,4 +29,21 @@ class ConfigTest < Test::Unit::TestCase
       assert_nil(context.config["nonexistent"])
     end
   end
+
+  test "#delete" do
+    context.config["rroonga.key"] = "value"
+    assert_equal("value", context.config["rroonga.key"])
+    context.config.delete("rroonga.key")
+    assert_nil(context.config["rroonga.key"])
+  end
+
+  test "#each" do
+    context.config["rroonga.key1"] = "value1"
+    context.config["rroonga.key2"] = "value2"
+    assert_equal([
+                    ["rroonga.key1", "value1"],
+                    ["rroonga.key2", "value2"],
+                 ],
+                 context.config.to_a)
+  end
 end

data/test/test-database.rb

@@ -71,8 +71,6 @@ class DatabaseTest < Test::Unit::TestCase
   end
 
   def test_new
-    # TODO: remove the line when Groonga 5.0.5 released.
-    omit("This test is failing on Groonga 5.0.4.") if Groonga.version == "5.0.4"
     assert_raise(Groonga::NoSuchFileOrDirectory) do
       new_context = Groonga::Context.new
       Groonga::Database.new(@database_path.to_s, :context => new_context)

data/test/test-error-message.rb

@@ -0,0 +1,20 @@
+# Copyright (C) 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
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# 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 ErrorMessageTest < Test::Unit::TestCase
+  def test_nonexistent
+    assert_nil(Groonga.error_message)
+  end
+end