rroonga 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 450be499e880c47f2314a3857389a9cf8dc09c25
-  data.tar.gz: b604764debc83c0b075de9becc94c04ac2f2a409
+  metadata.gz: 44cd8bad828ac3e88850ece173cadfa91bf63cbe
+  data.tar.gz: 2879bf2d247b4d6b316007244a3f17df66b4525c
 SHA512:
-  metadata.gz: 4a77d83e9f7f4d53da85d686d334a16fe2c5af57cf475d0774bf8f6477576657512dde969a0e915f79e38e43b68499dbde32784e917e8a33bb5d5a04c06ed2cc
-  data.tar.gz: 96148756e41053414d8bacc15f69262e6d7f4d0eac8f44ec318619641e29260e0d263430f25b1964f3d4f94225e5617fac5a793c141be3f5f51d1f9a650fe599
+  metadata.gz: c034fa1b10202553bb36e4f869921555f09c84fc633ff8ec1c14c9fc3c2631caf659a265dba4c6ec56bb6e63d8f3117aaf70ff1a327a517433b8b5136cb2c9b5
+  data.tar.gz: 74c9dc1f95d9fdba1f24aa477fade11fdf8c2d79e9e7d12da350c4bbb8482ce431dc1a2f5a371f96ef0b4622cd878ec8c0d9e2ce3067241772ab50dedcd0cf0c

data/bin/grndump

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2014  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
@@ -26,6 +26,7 @@ options = OpenStruct.new
 options.tables = []
 options.exclude_tables = []
 options.dump_schema = true
+options.dump_indexes = true
 options.dump_tables = true
 options.order_by = "id"
 option_parser = OptionParser.new do |parser|
@@ -37,6 +38,11 @@ option_parser = OptionParser.new do |parser|
     options.dump_schema = boolean
   end
 
+  parser.on("--no-dump-indexes",
+            "don't dump indexes.") do |boolean|
+    options.dump_indexes = boolean
+  end
+
   parser.on("--no-dump-tables",
             "don't dump tables.") do |boolean|
     options.dump_tables = boolean
@@ -88,6 +94,7 @@ dumper_options = {
   :output => $stdout,
   :error_output => $stderr,
   :dump_schema => options.dump_schema,
+  :dump_indexes => options.dump_indexes,
   :dump_tables => options.dump_tables,
   :tables => options.tables,
   :exclude_tables => options.exclude_tables,

data/doc/text/news.textile

@@ -1,5 +1,25 @@
 h1. NEWS
 
+h2(#3-1-2). 3.1.2: 2014-01-29
+
+h3. Improvements
+
+* Supported Groonga 3.1.2. Groonga 3.1.1 or older are not supported.
+* Added {Groonga::Table#support_value?}.
+* Added {Groonga::Record#support_value?}.
+* Added @_value@ value to {Groonga::Record#attributes} result.
+  [groonga-dev,02046] [Suggested by ongaeshi]
+* Added column values to {Groonga::Record#inspect} result.
+  [groonga-dev,02048] [Suggested by ongaeshi]
+* grndump: Added @--dump-indexes@ option that controls schema for
+  indexes output. It is useful to dump only schema for indexes.
+* Added {Groonga.lock_timeout}.
+* Added {Groonga.lock_timeout=}.
+
+h3. Thanks
+
+* ongaeshi
+
 h2(#3-1-1). 3.1.1: 2013-12-29
 
 h3. Improvements

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

@@ -2282,6 +2282,24 @@ rb_grn_table_support_key_p (VALUE self)
     return Qfalse;
 }
 
+/*
+ * @overload support_value?
+ *
+ *   @return @true@ if the table is created with value type, @false@
+ *   otherwise.
+ */
+static VALUE
+rb_grn_table_support_value_p (VALUE self)
+{
+    grn_id range_id;
+
+    rb_grn_table_deconstruct(SELF(self), NULL, NULL,
+                             NULL, NULL,
+                             NULL, &range_id, NULL,
+                             NULL);
+    return CBOOL2RVAL(range_id != GRN_ID_NIL);
+}
+
 /*
  * グループ化したとき、テーブルにグループに含まれるレコード
  * 数を格納できる場合は +true+ 、格納できない場合は +false+ を返
@@ -2503,6 +2521,8 @@ rb_grn_init_table (VALUE mGrn)
 
     rb_define_method(rb_cGrnTable, "support_key?",
                      rb_grn_table_support_key_p, 0);
+    rb_define_method(rb_cGrnTable, "support_value?",
+                     rb_grn_table_support_value_p, 0);
     rb_define_method(rb_cGrnTable, "support_sub_records?",
                      rb_grn_table_support_sub_records_p, 0);
     rb_define_method(rb_cGrnTable, "have_n_sub_records_space?",

data/ext/groonga/rb-grn.h

@@ -84,7 +84,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 3
 #define RB_GRN_MINOR_VERSION 1
-#define RB_GRN_MICRO_VERSION 1
+#define RB_GRN_MICRO_VERSION 2
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 

data/ext/groonga/rb-groonga.c

@@ -107,6 +107,47 @@ rb_grn_init_version (VALUE mGrn)
     rb_define_const(mGrn, "BINDINGS_VERSION", bindings_version);
 }
 
+/*
+ * Returns the current lock timeout.
+ *
+ * See
+ * http://groonga.org/docs/reference/api/global_configurations.html
+ * about lock timeout.
+ *
+ * @overload lock_timeout
+ *    @return [Integer] The current lock timeout.
+ */
+static VALUE
+rb_grn_s_get_lock_timeout (VALUE klass)
+{
+    return INT2NUM(grn_get_lock_timeout());
+}
+
+/*
+ * Sets the current lock timeout.
+ *
+ * @overload lock_timeout=(timeout)
+ *    @param [Integer] timeout The new lock timeout.
+ *
+ * @see {#lock_timeout}
+ * @since 3.1.2
+ */
+static VALUE
+rb_grn_s_set_lock_timeout (VALUE klass, VALUE timeout)
+{
+    grn_set_lock_timeout(NUM2INT(timeout));
+    return Qnil;
+}
+
+static void
+rb_grn_init_lock_timeout (VALUE mGrn)
+{
+    rb_define_singleton_method(mGrn, "lock_timeout",
+                               rb_grn_s_get_lock_timeout, 0);
+    rb_define_singleton_method(mGrn, "lock_timeout=",
+                               rb_grn_s_set_lock_timeout, 1);
+}
+
 void
 Init_groonga (void)
 {
@@ -120,6 +161,7 @@ Init_groonga (void)
     rb_set_end_proc(finish_groonga, Qnil);
 
     rb_grn_init_version(mGrn);
+    rb_grn_init_lock_timeout(mGrn);
 
     rb_grn_init_utils(mGrn);
     rb_grn_init_encoding(mGrn);

data/lib/groonga/dumper.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2014  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
@@ -55,11 +55,15 @@ module Groonga
         options[:database] = options[:context].database
       end
       options[:dump_schema] = true if options[:dump_schema].nil?
+      options[:dump_indexes] = true if options[:dump_indexes].nil?
       options[:dump_tables] = true if options[:dump_tables].nil?
 
+      if options[:dump_schema] or options[:dump_indexes]
+        schema_dumper = SchemaDumper.new(options.merge(:syntax => :command))
+      end
+
       if options[:dump_schema]
         dump_plugins(options)
-        schema_dumper = SchemaDumper.new(options.merge(:syntax => :command))
         schema_dumper.dump_tables
         if schema_dumper.have_reference_columns?
           options[:output].write("\n")
@@ -67,7 +71,7 @@ module Groonga
         end
       end
       dump_tables(options) if options[:dump_tables]
-      if options[:dump_schema] and schema_dumper.have_index_columns?
+      if options[:dump_indexes] and schema_dumper.have_index_columns?
         options[:output].write("\n")
         schema_dumper.dump_index_columns
       end

data/lib/groonga/record.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  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
@@ -117,6 +117,12 @@ module Groonga
       @table.support_key?
     end
 
+    # @return @true@ if the table that the record belongs to is
+    # created with value type, @false@ otherwise.
+    def support_value?
+      @table.support_value?
+    end
+
     # 名前が _name_ のカラムがレコードの所属するテーブルで定義され
     # ているなら +true+ を返す。
     def have_column?(name)
@@ -344,6 +350,11 @@ module Groonga
       @added = added
     end
 
+    # @private
+    def inspect
+      super.gsub(/>\z/, ", attributes: #{attributes.inspect}>")
+    end
+
     private
     def normalize_column_name(name)
       name.to_s
@@ -429,6 +440,7 @@ module Groonga
 
         add_id(attributes, record)
         add_key(attributes, record)
+        add_value(attributes, record)
         add_score(attributes, record)
         add_n_sub_records(attributes, record)
         add_columns(attributes, record)
@@ -482,6 +494,12 @@ module Groonga
         end
       end
 
+      def add_value(attributes, record)
+        if record.support_value?
+          attributes["_value"] = build_value(record.value)
+        end
+      end
+
       def add_score(attributes, record)
         if record.support_score?
           attributes["_score"] = record.score

data/rroonga-build.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  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
@@ -18,16 +18,16 @@
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 3
-    MINOR = 0
-    MICRO = 8
+    MINOR = 1
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2013, 9, 29)
+    RELEASED_DATE = Time.utc(2014, 1, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 3
     MINOR = 1
-    MICRO = 1
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-array.rb

@@ -22,6 +22,19 @@ class ArrayTest < Test::Unit::TestCase
     assert_not_predicate(Groonga::Array.create(:name => "Users"), :support_key?)
   end
 
+  class SupportValueTest < self
+    def test_have_value_type
+      assert_predicate(Groonga::Array.create(:name => "Users",
+                                             :value_type => "Int32"),
+                       :support_value?)
+    end
+
+    def test_no_value_type
+      assert_not_predicate(Groonga::Array.create(:name => "Users"),
+                           :support_value?)
+    end
+  end
+
   def test_inspect_size
     path = @tables_dir + "named.groonga"
     contain_table = Groonga::Array.create(:name => "name", :path => path.to_s)
@@ -108,7 +121,7 @@ class ArrayTest < Test::Unit::TestCase
       users.add(:name => "user #{i}" * 1000,
                 :address => "address #{i}" * 1000)
     end
-    assert_equal(7, users.defrag)
+    assert_equal(3, users.defrag)
   end
 
   def test_rename

data/test/test-database-dumper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2014  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
@@ -69,17 +69,17 @@ class DatabaseDumperTest < Test::Unit::TestCase
   end
 
   def dumped_schema
-    <<-EOS
+    <<-SCHEMA
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
 #{dumped_schema_index_columns}
-EOS
+    SCHEMA
   end
 
   def dumped_schema_tables
-    <<-EOS.chomp
+    <<-SCHEMA.chomp
 table_create Posts TABLE_NO_KEY
 column_create Posts created_at COLUMN_SCALAR Time
 column_create Posts n_goods COLUMN_SCALAR UInt32
@@ -93,22 +93,22 @@ column_create Tags name COLUMN_SCALAR Text
 
 table_create Users TABLE_HASH_KEY --key_type ShortText
 column_create Users name COLUMN_SCALAR Text
-EOS
+    SCHEMA
   end
 
   def dumped_schema_reference_columns
-    <<-EOS.chomp
+    <<-SCHEMA.chomp
 column_create Posts author COLUMN_SCALAR Users
 column_create Posts tags COLUMN_VECTOR Tags
-EOS
+    SCHEMA
   end
 
   def dumped_schema_index_columns
-    <<-EOS.chomp
+    <<-SCHEMA.chomp
 column_create Tags Posts_tag_text COLUMN_INDEX Posts tag_text
 
 column_create Users Posts_author COLUMN_INDEX Posts author
-EOS
+    SCHEMA
   end
 
   class EmptyTest < self
@@ -130,117 +130,115 @@ EOS
                 :title => "Why search engine find?")
     end
 
-    def test_default
-      assert_equal(<<-EOS, dump)
-#{dumped_schema_tables}
-
-#{dumped_schema_reference_columns}
-
+    def dumped_table_posts
+      <<-TABLE.chomp
 load --table Posts
 [
 ["_id","author","created_at","n_goods","published","rank","tag_text","tags","title"],
 [1,"mori",1268034720.0,4,true,10,"search mori",["search","mori"],"Why search engine find?"]
 ]
+      TABLE
+    end
 
+    def dumped_table_tags
+      <<-TABLE.chomp
 load --table Tags
 [
 ["_key","name"],
 ["search",""],
 ["mori",""]
 ]
+      TABLE
+    end
 
+    def dumped_table_users
+      <<-TABLE.chomp
 load --table Users
 [
 ["_key","name"],
 ["mori",""]
 ]
+      TABLE
+    end
+
+    def dumped_tables
+      <<-TABLES.chomp
+#{dumped_table_posts}
+
+#{dumped_table_tags}
+
+#{dumped_table_users}
+      TABLES
+    end
+
+    def test_default
+      assert_equal(<<-DUMP, dump)
+#{dumped_schema_tables}
+
+#{dumped_schema_reference_columns}
+
+#{dumped_tables}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_limit_tables
-      assert_equal(<<-EOS, dump(:tables => ["Posts"]))
+      assert_equal(<<-DUMP, dump(:tables => ["Posts"]))
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
-load --table Posts
-[
-["_id","author","created_at","n_goods","published","rank","tag_text","tags","title"],
-[1,"mori",1268034720.0,4,true,10,"search mori",["search","mori"],"Why search engine find?"]
-]
+#{dumped_table_posts}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_limit_tables_with_regexp
-      assert_equal(<<-EOS, dump(:tables => [/Posts?/]))
+      assert_equal(<<-DUMP, dump(:tables => [/Posts?/]))
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
-load --table Posts
-[
-["_id","author","created_at","n_goods","published","rank","tag_text","tags","title"],
-[1,"mori",1268034720.0,4,true,10,"search mori",["search","mori"],"Why search engine find?"]
-]
+#{dumped_table_posts}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_exclude_tables
       dump_options = {
         :exclude_tables => ["Posts"],
       }
-      assert_equal(<<-EOS, dump(dump_options))
+      assert_equal(<<-DUMP, dump(dump_options))
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
-load --table Tags
-[
-["_key","name"],
-["search",""],
-["mori",""]
-]
+#{dumped_table_tags}
 
-load --table Users
-[
-["_key","name"],
-["mori",""]
-]
+#{dumped_table_users}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_exclude_tables_with_regexp
       dump_options = {
         :exclude_tables => [/Posts?/],
       }
-      assert_equal(<<-EOS, dump(dump_options))
+      assert_equal(<<-DUMP, dump(dump_options))
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
-load --table Tags
-[
-["_key","name"],
-["search",""],
-["mori",""]
-]
+#{dumped_table_tags}
 
-load --table Users
-[
-["_key","name"],
-["mori",""]
-]
+#{dumped_table_users}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_tables_combination
@@ -248,42 +246,29 @@ EOS
         :exclude_tables => ["Posts"],
         :tables => ["Posts", "Users"],
       }
-      assert_equal(<<-EOS, dump(dump_options))
+      assert_equal(<<-DUMP, dump(dump_options))
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
-load --table Users
-[
-["_key","name"],
-["mori",""]
-]
+#{dumped_table_users}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_no_schema
-      assert_equal(<<-EOS, dump(:dump_schema => false))
-load --table Posts
-[
-["_id","author","created_at","n_goods","published","rank","tag_text","tags","title"],
-[1,"mori",1268034720.0,4,true,10,"search mori",["search","mori"],"Why search engine find?"]
-]
+      assert_equal(<<-DUMP, dump(:dump_schema => false))
+#{dumped_tables}
 
-load --table Tags
-[
-["_key","name"],
-["search",""],
-["mori",""]
-]
+#{dumped_schema_index_columns}
+      DUMP
+    end
 
-load --table Users
-[
-["_key","name"],
-["mori",""]
-]
-EOS
+    def test_no_schema_no_indexes
+      assert_equal(<<-DUMP, dump(:dump_schema => false, :dump_indexes => false))
+#{dumped_tables}
+      DUMP
     end
 
     def test_no_tables
@@ -360,7 +345,7 @@ COMMAND
     end
 
     def test_have_records
-      assert_equal(<<-EOS, dump)
+      assert_equal(<<-DUMP, dump)
 table_create Users TABLE_PAT_KEY --key_type ShortText
 
 load --table Users
@@ -369,7 +354,7 @@ load --table Users
 [\"mori\"],
 [\"s-yata\"]
 ]
-EOS
+      DUMP
     end
   end
 end

data/test/test-database.rb

@@ -150,7 +150,7 @@ class DatabaseTest < Test::Unit::TestCase
       users.add(:name => "user #{i}" * 1000,
                 :address => "address #{i}" * 1000)
     end
-    assert_equal(7, @database.defrag)
+    assert_equal(3, @database.defrag)
   end
 
   def test_tables

data/test/test-double-array-trie.rb

@@ -27,6 +27,21 @@ class DoubleArrayTrieTest < Test::Unit::TestCase
                      :support_key?)
   end
 
+  class SupportValueTest < self
+    def test_have_value_type
+      assert_predicate(Groonga::DoubleArrayTrie.create(:name => "Users",
+                                                       :key_type => "ShortText",
+                                                       :value_type => "Int32"),
+                       :support_value?)
+    end
+
+    def test_no_value_type
+      assert_not_predicate(Groonga::DoubleArrayTrie.create(:name => "Users",
+                                                           :key_type => "ShortText"),
+                           :support_value?)
+    end
+  end
+
   def test_encoding
     assert_equal(Groonga::Encoding.default,
                  Groonga::DoubleArrayTrie.create.encoding)
@@ -148,7 +163,7 @@ class DoubleArrayTrieTest < Test::Unit::TestCase
                 :name => "user #{i}" * 1000,
                 :address => "address #{i}" * 1000)
     end
-    assert_equal(7, users.defrag)
+    assert_equal(3, users.defrag)
   end
 
   def test_rename

data/test/test-hash.rb

@@ -26,6 +26,21 @@ class HashTest < Test::Unit::TestCase
                      :support_key?)
   end
 
+  class SupportValueTest < self
+    def test_have_value_type
+      assert_predicate(Groonga::Hash.create(:name => "Users",
+                                            :key_type => "ShortText",
+                                            :value_type => "Int32"),
+                       :support_value?)
+    end
+
+    def test_no_value_type
+      assert_not_predicate(Groonga::Hash.create(:name => "Users",
+                                                :key_type => "ShortText"),
+                           :support_value?)
+    end
+  end
+
   class DeleteTest < self
     setup
     def setup_data
@@ -357,7 +372,7 @@ class HashTest < Test::Unit::TestCase
                 :name => "user #{i}" * 1000,
                 :address => "address #{i}" * 1000)
     end
-    assert_equal(7, users.defrag)
+    assert_equal(3, users.defrag)
   end
 
   def test_rename

data/test/test-lock-timeout.rb

@@ -0,0 +1,29 @@
+# Copyright (C) 2014  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 LockTimeoutTest < Test::Unit::TestCase
+  def setup
+    @original_lock_timeout = Groonga.lock_timeout
+  end
+
+  def teardown
+    Groonga.lock_timeout = @original_lock_timeout
+  end
+
+  def test_accessor
+    Groonga.lock_timeout = 10
+    assert_equal(10, Groonga.lock_timeout)
+  end
+end

data/test/test-patricia-trie.rb

@@ -27,6 +27,21 @@ class PatriciaTrieTest < Test::Unit::TestCase
                      :support_key?)
   end
 
+  class SupportValueTest < self
+    def test_have_value_type
+      assert_predicate(Groonga::PatriciaTrie.create(:name => "Users",
+                                                    :key_type => "ShortText",
+                                                    :value_type => "Int32"),
+                       :support_value?)
+    end
+
+    def test_no_value_type
+      assert_not_predicate(Groonga::PatriciaTrie.create(:name => "Users",
+                                                        :key_type => "ShortText"),
+                           :support_value?)
+    end
+  end
+
   def test_encoding
     assert_equal(Groonga::Encoding.default,
                  Groonga::PatriciaTrie.create.encoding)
@@ -407,7 +422,7 @@ class PatriciaTrieTest < Test::Unit::TestCase
                 :name => "user #{i}" * 1000,
                 :address => "address #{i}" * 1000)
     end
-    assert_equal(7, users.defrag)
+    assert_equal(3, users.defrag)
   end
 
   def test_rename

data/test/test-record.rb

@@ -309,197 +309,231 @@ class RecordTest < Test::Unit::TestCase
     assert_not_predicate(groonga, :locked?)
   end
 
-  def test_attributes
-    values = {
-      "uri" => "http://groonga.org/",
-      "rate" => 5,
-      "comment" => "Great!"
-    }
-    groonga = @bookmarks.add(values)
-    assert_equal(values.merge("_id" => groonga.id,
-                              "content" => nil,
-                              "user" => nil),
-                 groonga.attributes)
-  end
+  class AttributesTest < self
+    def test_basic
+      values = {
+        "uri" => "http://groonga.org/",
+        "rate" => 5,
+        "comment" => "Great!"
+      }
+      groonga = @bookmarks.add(values)
+      assert_equal(values.merge("_id" => groonga.id,
+                                "_value" => 0,
+                                "content" => nil,
+                                "user" => nil),
+                   groonga.attributes)
+    end
 
-  def test_recursive_attributes
-    need_self_recursive_equal
+    def test_recursive
+      need_self_recursive_equal
 
-    @bookmarks.define_column("next", @bookmarks)
+      @bookmarks.define_column("next", @bookmarks)
 
-    top_page_record = @bookmarks.add(top_page)
-    doc_page_record = @bookmarks.add(doc_page)
+      top_page_record = @bookmarks.add(top_page)
+      doc_page_record = @bookmarks.add(doc_page)
 
-    top_page_record["next"] = doc_page_record
-    doc_page_record["next"] = top_page_record
+      top_page_record["next"] = doc_page_record
+      doc_page_record["next"] = top_page_record
 
-    expected = {
-      "_id" => 1,
-      "user" => nil,
-      "uri" => "http://groonga.org/",
-      "rate" => 5,
-      "next" => {
-        "_id" => 2,
+      expected = {
+        "_id" => 1,
+        "_value" => 0,
         "user" => nil,
-        "uri" => "http://groonga.org/document.html",
-        "rate" => 8,
+        "uri" => "http://groonga.org/",
+        "rate" => 5,
+        "next" => {
+          "_id" => 2,
+          "_value" => 0,
+          "user" => nil,
+          "uri" => "http://groonga.org/document.html",
+          "rate" => 8,
+          "content" => nil,
+          "comment" => "Informative"
+        },
         "content" => nil,
-        "comment" => "Informative"
-      },
-      "content" => nil,
-      "comment" => "Great!"
-    }
-    expected["next"]["next"] = expected
+        "comment" => "Great!"
+      }
+      expected["next"]["next"] = expected
 
-    assert_equal(expected, top_page_record.attributes)
-  end
+      assert_equal(expected, top_page_record.attributes)
+    end
 
-  def test_duplicate_records_attributes
-    need_self_recursive_equal
+    def test_duplicate_records
+      need_self_recursive_equal
 
-    @bookmarks.define_column("next1", @bookmarks)
-    @bookmarks.define_column("next2", @bookmarks)
+      @bookmarks.define_column("next1", @bookmarks)
+      @bookmarks.define_column("next2", @bookmarks)
 
-    top_page_record = @bookmarks.add(top_page)
-    doc_page_record = @bookmarks.add(doc_page)
+      top_page_record = @bookmarks.add(top_page)
+      doc_page_record = @bookmarks.add(doc_page)
 
-    top_page_record["next1"] = doc_page_record
-    top_page_record["next2"] = doc_page_record
-    doc_page_record["next1"] = top_page_record
+      top_page_record["next1"] = doc_page_record
+      top_page_record["next2"] = doc_page_record
+      doc_page_record["next1"] = top_page_record
 
-    doc_page_attributes = {
-      "_id" => 2,
-      "user" => nil,
-      "uri" => "http://groonga.org/document.html",
-      "rate" => 8,
-      "content" => nil,
-      "comment" => "Informative",
-      "next2" => nil
-    }
-    top_page_attributes = {
-      "_id" => 1,
-      "user" => nil,
-      "uri" => "http://groonga.org/",
-      "rate" => 5,
-      "next1" => doc_page_attributes,
-      "next2" => doc_page_attributes,
-      "content" => nil,
-      "comment" => "Great!"
-    }
-    doc_page_attributes["next1"] = top_page_attributes
+      doc_page_attributes = {
+        "_id" => 2,
+        "_value" => 0,
+        "user" => nil,
+        "uri" => "http://groonga.org/document.html",
+        "rate" => 8,
+        "content" => nil,
+        "comment" => "Informative",
+        "next2" => nil
+      }
+      top_page_attributes = {
+        "_id" => 1,
+        "_value" => 0,
+        "user" => nil,
+        "uri" => "http://groonga.org/",
+        "rate" => 5,
+        "next1" => doc_page_attributes,
+        "next2" => doc_page_attributes,
+        "content" => nil,
+        "comment" => "Great!"
+      }
+      doc_page_attributes["next1"] = top_page_attributes
 
-    actual_records = top_page_record.attributes
-    assert_equal(top_page_attributes, actual_records)
-    assert_equal(actual_records["next1"].object_id,
-                 actual_records["next2"].object_id)
-  end
+      actual_records = top_page_record.attributes
+      assert_equal(top_page_attributes, actual_records)
+      assert_equal(actual_records["next1"].object_id,
+                   actual_records["next2"].object_id)
+    end
 
-  def test_select_result_attributes
-    @bookmarks.add(top_page)
-    select_result = @bookmarks.select
-    select_result_result = select_result.first
+    def test_select_result
+      @bookmarks.add(top_page)
+      select_result = @bookmarks.select
+      select_result_result = select_result.first
 
-    expected_attributes = {
-      "_id" => 1,
-      "_key" => {
-        "comment" => "Great!",
-        "content" => nil,
+      expected_attributes = {
         "_id" => 1,
-        "rate" => 5,
-        "uri" => "http://groonga.org/",
-        "user" => nil
-      },
-      "_score" => 1,
-    }
+        "_key" => {
+          "comment" => "Great!",
+          "content" => nil,
+          "_id" => 1,
+          "_value" => 0,
+          "rate" => 5,
+          "uri" => "http://groonga.org/",
+          "user" => nil
+        },
+        "_score" => 1,
+      }
 
-    assert_equal(expected_attributes, select_result_result.attributes)
-  end
+      assert_equal(expected_attributes, select_result_result.attributes)
+    end
 
-  def test_self_referencing_attributes
-    need_self_recursive_equal
+    def test_sort_result
+      @bookmarks.add(top_page)
+      sort_result = @bookmarks.sort(["_id"])
+      sort_result_result = sort_result.first
 
-    @bookmarks.define_column("next", @bookmarks)
+      expected_attributes = {
+        "_id" => 1,
+        "_value" => {
+          "comment" => "Great!",
+          "content" => nil,
+          "_id" => 1,
+          "_value" => 0,
+          "rate" => 5,
+          "uri" => "http://groonga.org/",
+          "user" => nil
+        },
+      }
 
-    top_page_record = @bookmarks.add(top_page)
-    top_page_record["next"] = top_page_record
+      assert_equal(expected_attributes, sort_result_result.attributes)
+    end
 
-    expected = {
-      "_id" => 1,
-      "user" => nil,
-      "uri" => "http://groonga.org/",
-      "rate" => 5,
-      "content" => nil,
-      "comment" => "Great!"
-    }
-    expected["next"] = expected
+    def test_self_referencing
+      need_self_recursive_equal
 
-    assert_equal(expected, top_page_record.attributes)
-  end
+      @bookmarks.define_column("next", @bookmarks)
 
-  def test_vector_attributes
-    @bookmarks.define_column("related_bookmarks", @bookmarks, :type => :vector)
+      top_page_record = @bookmarks.add(top_page)
+      top_page_record["next"] = top_page_record
 
-    top_page_record = @bookmarks.add(top_page)
-    doc_page_record = @bookmarks.add(doc_page)
-    top_page_record["related_bookmarks"] = [doc_page_record]
+      expected = {
+        "_id" => 1,
+        "_value" => 0,
+        "user" => nil,
+        "uri" => "http://groonga.org/",
+        "rate" => 5,
+        "content" => nil,
+        "comment" => "Great!"
+      }
+      expected["next"] = expected
 
-    expected = {
-      "_id" => 1,
-      "user" => nil,
-      "uri" => "http://groonga.org/",
-      "rate" => 5,
-      "related_bookmarks" => [
-        {
-          "_id" => 2,
-          "comment" => "Informative",
-          "content" => nil,
-          "rate" => 8,
-          "related_bookmarks" => [],
-          "uri" => "http://groonga.org/document.html",
-          "user" => nil,
-        }
-      ],
-      "content" => nil,
-      "comment" => "Great!"
-    }
+      assert_equal(expected, top_page_record.attributes)
+    end
 
-    assert_equal(expected, top_page_record.attributes)
-  end
+    def test_vector
+      @bookmarks.define_column("related_bookmarks", @bookmarks, :type => :vector)
 
-  def test_self_referencing_vector_attributes
-    need_self_recursive_equal
+      top_page_record = @bookmarks.add(top_page)
+      doc_page_record = @bookmarks.add(doc_page)
+      top_page_record["related_bookmarks"] = [doc_page_record]
 
-    @bookmarks.define_column("related_bookmarks", @bookmarks, :type => :vector)
+      expected = {
+        "_id" => 1,
+        "_value" => 0,
+        "user" => nil,
+        "uri" => "http://groonga.org/",
+        "rate" => 5,
+        "related_bookmarks" => [
+          {
+            "_id" => 2,
+            "_value" => 0,
+            "comment" => "Informative",
+            "content" => nil,
+            "rate" => 8,
+            "related_bookmarks" => [],
+            "uri" => "http://groonga.org/document.html",
+            "user" => nil,
+          }
+        ],
+        "content" => nil,
+        "comment" => "Great!"
+      }
 
-    top_page_record = @bookmarks.add(top_page)
-    doc_page_record = @bookmarks.add(doc_page)
-    top_page_record["related_bookmarks"] = [
-      top_page_record,
-      doc_page_record
-    ]
+      assert_equal(expected, top_page_record.attributes)
+    end
 
-    top_page_attributes = {
-      "_id" => 1,
-      "user" => nil,
-      "uri" => "http://groonga.org/",
-      "rate" => 5,
-      "content" => nil,
-      "comment" => "Great!"
-    }
-    doc_page_attributes = {
-      "_id" => 2,
-      "comment" => "Informative",
-      "content" => nil,
-      "rate" => 8,
-      "related_bookmarks" => [],
-      "uri" => "http://groonga.org/document.html",
-      "user" => nil,
-    }
-    top_page_attributes["related_bookmarks"] = [
-      top_page_attributes,
-      doc_page_attributes
-    ]
-    assert_equal(top_page_attributes, top_page_record.attributes)
+    def test_self_referencing_vector
+      need_self_recursive_equal
+
+      @bookmarks.define_column("related_bookmarks", @bookmarks, :type => :vector)
+
+      top_page_record = @bookmarks.add(top_page)
+      doc_page_record = @bookmarks.add(doc_page)
+      top_page_record["related_bookmarks"] = [
+        top_page_record,
+        doc_page_record
+      ]
+
+      top_page_attributes = {
+        "_id" => 1,
+        "_value" => 0,
+        "user" => nil,
+        "uri" => "http://groonga.org/",
+        "rate" => 5,
+        "content" => nil,
+        "comment" => "Great!"
+      }
+      doc_page_attributes = {
+        "_id" => 2,
+        "_value" => 0,
+        "comment" => "Informative",
+        "content" => nil,
+        "rate" => 8,
+        "related_bookmarks" => [],
+        "uri" => "http://groonga.org/document.html",
+        "user" => nil,
+      }
+      top_page_attributes["related_bookmarks"] = [
+        top_page_attributes,
+        doc_page_attributes
+      ]
+      assert_equal(top_page_attributes, top_page_record.attributes)
+    end
   end
 
   def test_dynamic_accessor

data/test/test-variable-size-column.rb

@@ -116,7 +116,7 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     1000.times do |i|
       @users.add(:name => "user #{i}" * 1000)
     end
-    assert_equal(3, @name.defrag)
+    assert_equal(1, @name.defrag)
   end
 
   class VectorTest < self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -329,6 +329,7 @@ files:
 - test/test-version.rb
 - test/test-index-cursor.rb
 - test/test-double-array-trie.rb
+- test/test-lock-timeout.rb
 - test/test-exception.rb
 - test/test-schema-dumper.rb
 - test/test-schema-type.rb
@@ -412,6 +413,7 @@ test_files:
 - test/test-version.rb
 - test/test-index-cursor.rb
 - test/test-double-array-trie.rb
+- test/test-lock-timeout.rb
 - test/test-exception.rb
 - test/test-schema-dumper.rb
 - test/test-schema-type.rb