rroonga 3.0.2-x86-mingw32 → 3.0.4-x86-mingw32

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

@@ -1147,7 +1147,9 @@ rb_grn_obj_to_ruby_object (VALUE klass, grn_ctx *context,
       /* case GRN_PTR: */
       /* case GRN_UVECTOR: */
       /* case GRN_PVECTOR: */
-      /* case GRN_VECTOR: */
+      case GRN_VECTOR:
+        return GRNVECTOR2RVAL(context, obj);
+        break;
       /* case GRN_MSG: */
       /* case GRN_QUERY: */
       /* case GRN_ACCESSOR: */

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

@@ -68,13 +68,19 @@ static VALUE
 rb_grn_variable_get_value (VALUE self)
 {
     grn_ctx *context = NULL;
-    grn_obj *variable;
+    grn_obj *variable, *value;
 
     rb_grn_variable_deconstruct(SELF(self), &variable, &context,
                                 NULL, NULL,
                                 NULL, NULL);
 
-    return GRNOBJ2RVAL(Qnil, context, variable, self);
+    if (variable->header.type == GRN_PTR) {
+        value = GRN_PTR_VALUE(variable);
+    } else {
+        value = variable;
+    }
+
+    return GRNOBJ2RVAL(Qnil, context, value, self);
 }
 
 /*
@@ -83,7 +89,7 @@ rb_grn_variable_get_value (VALUE self)
  * @overload value=(value)
  */
 static VALUE
-rb_grn_variable_set_value (VALUE self, VALUE value)
+rb_grn_variable_set_value (VALUE self, VALUE rb_value)
 {
     grn_ctx *context = NULL;
     grn_obj *variable;
@@ -91,7 +97,14 @@ rb_grn_variable_set_value (VALUE self, VALUE value)
     rb_grn_variable_deconstruct(SELF(self), &variable, &context,
                                 NULL, NULL,
                                 NULL, NULL);
-    RVAL2GRNOBJ(value, context, &variable);
+    if (variable->header.type == GRN_PTR) {
+        grn_obj *value = NULL;
+        RVAL2GRNOBJ(rb_value, context, &value);
+        GRN_PTR_SET(context, variable, value);
+    } else {
+        RVAL2GRNOBJ(rb_value, context, &variable);
+    }
+
     return Qnil;
 }
 

data/ext/groonga/rb-grn.h

@@ -76,7 +76,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 3
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 2
+#define RB_GRN_MICRO_VERSION 4
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -212,6 +212,7 @@ RB_GRN_VAR VALUE rb_eGrnError;
 RB_GRN_VAR VALUE rb_eGrnClosed;
 RB_GRN_VAR VALUE rb_eGrnNoSuchColumn;
 RB_GRN_VAR VALUE rb_eGrnInvalidArgument;
+RB_GRN_VAR VALUE rb_eGrnNoMemoryAvailable;
 RB_GRN_VAR VALUE rb_cGrnObject;
 RB_GRN_VAR VALUE rb_mGrnEncodingSupport;
 RB_GRN_VAR VALUE rb_cGrnDatabase;

data/lib/groonga/record.rb

@@ -15,9 +15,11 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-require 'English'
+require "English"
 require "time"
 
+require "groonga/sub-records"
+
 module Groonga
   class Record
     # レコードが所属するテーブル
@@ -87,7 +89,7 @@ module Groonga
     #   @option value_with_weight [Integer or nil] :weight (nil)
     #     The weight for the value. You need to use vector column and
     #     weight supported index column for weight. See
-    #     {Groonga;:Table#set_column_value} for details.
+    #     {Groonga::Table#set_column_value} for details.
     #
     #   @example Set a new value with weight "2"
     #     user["tags"] = [{:value => "groonga", :weight => 2}]
@@ -316,6 +318,11 @@ module Groonga
       @table.exist?(@id)
     end
 
+    # @return [SubRecords] Sub records of the record.
+    def sub_records
+      SubRecords.new(self)
+    end
+
     # @private
     def methods(include_inherited=true)
       original_methods = super

data/lib/groonga/sub-records.rb

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+module Groonga
+  # Represents sub records of a {Record}. Grouped result set by
+  # {Table#group} only has sub records.
+  #
+  # {SubRecords} acts like an ::Array.
+  class SubRecords
+    include Enumerable
+
+    # The record that has this sub records.
+    attr_reader :record
+
+    # Creates a sub records container for the _record_.
+    #
+    # Normally, users don't need to instantiate {SubRecords}
+    # directly. {Record#sub_records} creates and returns a
+    # {SubRecords}.
+    #
+    # @param record [Record] The record that has this sub records.
+    def initialize(record)
+      @record = record
+    end
+
+    # @yield [record] Gives a sub record to the block.
+    # @yieldparam record [Record] A sub record.
+    # @return [void]
+    def each(&block)
+      @record.table.each_sub_record(@record.record_raw_id, &block)
+    end
+
+    # @return [Array<Record>] Sub records as ::Array.
+    def to_a
+      @sub_records ||= super
+    end
+
+    # Acts as ::Array
+    alias_method :to_ary, :to_a
+
+    # @param index [Integer] A 0-origin index.
+    # @return [Record] A sub record at _index_.
+    def [](index)
+      to_a[index]
+    end
+  end
+end
+

data/rroonga-build.rb

@@ -19,8 +19,9 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 3
     MINOR = 0
-    MICRO = 4
+    MICRO = 5
     VERSION = [MAJOR, MINOR, MICRO]
+    RELEASED_DATE = Time.utc(2013, 6, 29)
   end
 
   module_function

data/rroonga.gemspec

@@ -76,7 +76,7 @@ Gem::Specification.new do |s|
 
   s.homepage = "http://groonga.rubyforge.org/#about-rroonga"
   s.licenses = ["LGPLv2"]
-  s.require_paths = ["lib"]
+  s.require_paths = ["lib", "ext/groonga"]
   s.rubyforge_project = "groonga"
 
   s.required_ruby_version = ">= 1.9.3"

data/test/test-array.rb

@@ -203,10 +203,30 @@ EXPECTED_OUTPUT
       end
     end
 
+    def test_unblock
+      IO.pipe do |read_io, write_io|
+        Tempfile.open("not_blocked_pull.rb") do |pull_rb|
+          pull_rb.puts(pull_rb_source(":block? => true"))
+          pull_rb.close
+
+          pid = spawn({}, RbConfig.ruby, pull_rb.path, :out => write_io)
+          assert_equal("start", read_io.gets.chomp)
+          Process.kill(:TERM, pid)
+          @queue.unblock
+          assert_equal("SIGTERM", read_io.gets.chomp)
+          wait_finished(pid)
+          write_io.close
+          assert_equal("done", read_io.read.chomp)
+        end
+      end
+    end
+
     private
     def pull_rb_source(options)
       base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
       <<-CODE
+$stdout.sync = true
+
 base_dir = #{base_dir.dump}
 ext_dir = File.join(base_dir, "ext", "groonga")
 lib_dir = File.join(base_dir, "lib")
@@ -216,6 +236,10 @@ $LOAD_PATH.unshift(lib_dir)
 
 require "groonga"
 
+trap(:TERM) do
+  puts("SIGTERM")
+end
+
 puts("start")
 Groonga::Context.default.open_database(#{@database_path.to_s.dump}) do
   queue = Groonga["Queue"]
@@ -226,5 +250,16 @@ end
 puts("done")
 CODE
     end
+
+    def wait_finished(pid)
+      n_retries = 3
+      n_retries.times do |i|
+        @queue.unblock
+        finished_pid = Process.waitpid(pid, Process::WNOHANG)
+        return if finished_pid
+        sleep((2 ** i) * 0.1)
+      end
+      Process.waitpid(pid)
+    end
   end
 end

data/test/test-context.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2013  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
@@ -41,6 +41,7 @@ class ContextTest < Test::Unit::TestCase
   end
 
   def test_create_temporary_database
+    Groonga::Logger.register(nil)
     before_files = @tmp_dir.children
     context = Groonga::Context.new
     database = context.create_database

data/test/test-database.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2013  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
@@ -29,6 +29,7 @@ class DatabaseTest < Test::Unit::TestCase
   end
 
   def test_temporary
+    Groonga::Logger.register(nil)
     before_files = @tmp_dir.children
     database = Groonga::Database.create
     assert_nil(database.name)

data/test/test-expression.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2013  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
@@ -30,9 +30,9 @@ class ExpressionTest < Test::Unit::TestCase
     expression.append_object(ryoqun)
     expression.append_object(mori)
 
-    assert_equal("ryoqun", expression["user"])
-    assert_equal("ryoqun", expression[0])
-    assert_equal("mori", expression[1])
+    assert_equal("ryoqun", expression["user"].value)
+    assert_equal("ryoqun", expression[0].value)
+    assert_equal("mori", expression[1].value)
   end
 
   def test_get_value
@@ -131,4 +131,14 @@ class ExpressionTest < Test::Unit::TestCase
                  snippet.execute("ラングバプロジェクトはカラムストア機能も"))
     snippet.close
   end
+
+  class VariableTest < self
+    def test_reference
+      expression = Groonga::Expression.new
+      variable = expression.define_variable(:name => "$condition",
+                                            :reference => true)
+      variable.value = "TODO: Change me to expression"
+      assert_equal("TODO: Change me to expression", variable.value)
+    end
+  end
 end

data/test/test-sub-records.rb

@@ -0,0 +1,109 @@
+# Copyright (C) 2013  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+class SubRecordsTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  def setup
+    setup_database
+    setup_schema
+    setup_data
+    setup_searched
+  end
+
+  def setup_schema
+    Groonga::Schema.define do |schema|
+      schema.create_table("Bookmarks", :type => :hash) do |table|
+        table.text("title")
+      end
+
+      schema.create_table("Comments", :type => :array) do |table|
+        table.reference("bookmark")
+        table.text("content")
+        table.int32("rank")
+      end
+    end
+  end
+
+  def setup_data
+    setup_bookmarks
+    setup_comments
+  end
+
+  def setup_bookmarks
+    @bookmarks = Groonga["Bookmarks"]
+    @groonga = @bookmarks.add("http://groonga.org/", :title => "groonga")
+    @ruby = @bookmarks.add("http://ruby-lang.org/", :title => "Ruby")
+  end
+
+  def setup_comments
+    @comments = Groonga["Comments"]
+    @comments.add(:bookmark => @groonga,
+                  :content => "garbage comment1",
+                  :rank => 0)
+    @comments.add(:bookmark => @groonga,
+                  :content => "garbage comment2",
+                  :rank => 0)
+    @comments.add(:bookmark => @groonga,
+                  :content => "full-text search",
+                  :rank => 1)
+    @comments.add(:bookmark => @groonga,
+                  :content => "column store",
+                  :rank => 5)
+    @comments.add(:bookmark => @ruby,
+                  :content => "object oriented script language",
+                  :rank => 100)
+    @comments.add(:bookmark => @ruby,
+                  :content => "multi paradigm programming language",
+                  :rank => 80)
+  end
+
+  def setup_searched
+    @records = @comments.select do |record|
+      record.rank > 0
+    end
+  end
+
+  def test_array_reference
+    grouped_records = @records.group("bookmark", :max_n_sub_records => 2)
+    groups = grouped_records.collect do |record|
+      [record.title, record.sub_records[0].content]
+    end
+    assert_equal([
+                   [
+                     "groonga",
+                     "full-text search",
+                   ],
+                   [
+                     "Ruby",
+                     "object oriented script language",
+                   ],
+                 ],
+                 groups)
+  end
+
+  def test_to_ary
+    grouped_records = @records.group("bookmark", :max_n_sub_records => 2)
+    sub_record1, sub_record2 = grouped_records.first.sub_records
+    assert_equal([
+                   "full-text search",
+                   "column store",
+                 ],
+                 [
+                   sub_record1.content,
+                   sub_record2.content,
+                 ])
+  end
+end

data/test/test-table.rb

@@ -681,6 +681,110 @@ class TableTest < Test::Unit::TestCase
     assert_not_predicate(bookmarks, :builtin?)
   end
 
+  class GroupTest < self
+    class MaxNSubRecordsTest < self
+      setup
+      def setup_schema
+        Groonga::Schema.define do |schema|
+          schema.create_table("Bookmarks", :type => :hash) do |table|
+            table.text("title")
+          end
+
+          schema.create_table("Comments", :type => :array) do |table|
+            table.reference("bookmark")
+            table.text("content")
+            table.int32("rank")
+          end
+        end
+      end
+
+      setup
+      def setup_data
+        setup_bookmarks
+        setup_comments
+      end
+
+      def setup_bookmarks
+        @bookmarks = Groonga["Bookmarks"]
+        @groonga = @bookmarks.add("http://groonga.org/", :title => "groonga")
+        @ruby = @bookmarks.add("http://ruby-lang.org/", :title => "Ruby")
+      end
+
+      def setup_comments
+        @comments = Groonga["Comments"]
+        @comments.add(:bookmark => @groonga,
+                      :content => "garbage comment1",
+                      :rank => 0)
+        @comments.add(:bookmark => @groonga,
+                      :content => "garbage comment2",
+                      :rank => 0)
+        @comments.add(:bookmark => @groonga,
+                      :content => "full-text search",
+                      :rank => 1)
+        @comments.add(:bookmark => @groonga,
+                      :content => "column store",
+                      :rank => 5)
+        @comments.add(:bookmark => @ruby,
+                      :content => "object oriented script language",
+                      :rank => 100)
+        @comments.add(:bookmark => @ruby,
+                      :content => "multi paradigm programming language",
+                      :rank => 80)
+      end
+
+      setup
+      def setup_searched
+        @records = @comments.select do |record|
+          record.rank > 0
+        end
+      end
+
+      def test_upper_limit
+        grouped_records = @records.group("bookmark", :max_n_sub_records => 2)
+        groups = grouped_records.collect do |record|
+          sub_record_contents = record.sub_records.collect do |sub_record|
+            sub_record.content
+          end
+          [record.title, sub_record_contents]
+        end
+        assert_equal([
+                       [
+                         "groonga",
+                         [
+                           "full-text search",
+                           "column store",
+                         ],
+                       ],
+                       [
+                         "Ruby",
+                         [
+                           "object oriented script language",
+                           "multi paradigm programming language",
+                         ],
+                       ],
+                     ],
+                     groups)
+      end
+
+      def test_less_than_limit
+        sorted = @records.sort([{:key => "rank", :order => :descending}],
+                               :limit => 3, :offset => 0)
+        grouped_records = sorted.group("bookmark", :max_n_sub_records => 2)
+        groups = grouped_records.collect do |record|
+          sub_record_ranks = record.sub_records.collect do |sub_record|
+            sub_record.rank
+          end
+          [record.title, sub_record_ranks]
+        end
+        assert_equal([
+                       ["Ruby", [100, 80]],
+                       ["groonga", [5]]
+                     ],
+                     groups)
+      end
+    end
+  end
+
   class OtherProcessTest < self
     def test_create
       by_other_process do