rroonga 4.0.4-x86-mingw32 → 4.0.5-x86-mingw32

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

@@ -470,7 +470,7 @@ ruby_object_to_column_name (VALUE rb_name,
 {
     switch (TYPE(rb_name)) {
       case T_SYMBOL:
-        *name = rb_id2name(SYM2ID(rb_name));
+        *name = RSYMBOL2CSTR(rb_name);
         *name_size = strlen(*name);
         break;
       case T_STRING:

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

@@ -670,12 +670,8 @@ rb_grn_add_vector_element (VALUE rb_element, grn_ctx *context, grn_obj *vector,
     if (RVAL2CBOOL(rb_obj_is_kind_of(rb_element, rb_cHash))) {
         VALUE rb_value;
         VALUE rb_weight;
-        ID id_value;
-        ID id_weight;
-        CONST_ID(id_value, "value");
-        CONST_ID(id_weight, "weight");
-        rb_value = rb_hash_aref(rb_element, ID2SYM(id_value));
-        rb_weight = rb_hash_aref(rb_element, ID2SYM(id_weight));
+        rb_value = rb_hash_aref(rb_element, RB_GRN_INTERN("value"));
+        rb_weight = rb_hash_aref(rb_element, RB_GRN_INTERN("weight"));
         RVAL2GRNOBJ(rb_value, context, &value_buffer);
         if (!NIL_P(rb_weight)) {
             weight = NUM2UINT(rb_weight);

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

@@ -210,10 +210,10 @@ rb_grn_variable_size_column_array_reference (VALUE self, VALUE rb_id)
 
         rb_element = rb_hash_new();
         rb_hash_aset(rb_element,
-                     ID2SYM(rb_intern("value")),
+                     RB_GRN_INTERN("value"),
                      rb_element_value);
         rb_hash_aset(rb_element,
-                     ID2SYM(rb_intern("weight")),
+                     RB_GRN_INTERN("weight"),
                      UINT2NUM(weight));
 
         rb_ary_push(rb_value, rb_element);

data/ext/groonga/rb-grn.h

@@ -40,6 +40,14 @@
 #  define NUM2USHORT(object) NUM2UINT(object)
 #endif
 
+#ifndef HAVE_RB_SYM2STR
+#  define rb_sym2str(symbol) (rb_id2str(SYM2ID(symbol)))
+#endif
+
+#ifndef HAVE_RB_TO_SYMBOL
+#  define rb_to_symbol(rb_string) (rb_str_intern(rb_string))
+#endif
+
 #include <groonga.h>
 
 #if defined(__cplusplus)
@@ -84,7 +92,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 4
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 4
+#define RB_GRN_MICRO_VERSION 5
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -94,6 +102,7 @@ RB_GRN_BEGIN_DECLS
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))
 #define RB_GRN_TABLE(object) ((RbGrnTable *)(object))
 #define RB_GRN_TABLE_KEY_SUPPORT(object) ((RbGrnTableKeySupport *)(object))
+#define RB_GRN_DOUBLE_ARRAY_TRIE(object) ((RbGrnDoubleArrayTrie *)(object))
 #define RB_GRN_TABLE_CURSOR(object) ((RbGrnTableCursort *)(object))
 #define RB_GRN_COLUMN(object) ((RbGrnColumn *)(object))
 #define RB_GRN_VARIABLE_SIZE_COLUMN(object) ((RbGrnVariableSizeColumn *)(object))
@@ -153,6 +162,13 @@ struct _RbGrnTableKeySupport
     grn_obj *key;
 };
 
+typedef struct _RbGrnDoubleArrayTrie RbGrnDoubleArrayTrie;
+struct _RbGrnDoubleArrayTrie
+{
+    RbGrnTableKeySupport parent;
+    grn_obj *new_key;
+};
+
 typedef struct _RbGrnColumn RbGrnColumn;
 struct _RbGrnColumn
 {
@@ -486,6 +502,13 @@ void           rb_grn_table_key_support_deconstruct (RbGrnTableKeySupport *rb_gr
 grn_id         rb_grn_table_key_support_get         (VALUE self,
                                                      VALUE rb_key);
 
+void           rb_grn_double_array_trie_bind        (RbGrnDoubleArrayTrie *rb_grn_double_array_trie,
+                                                     grn_ctx *context,
+                                                     grn_obj *double_array_trie);
+void           rb_grn_double_array_trie_finalizer   (grn_ctx *context,
+                                                     grn_obj *grn_object,
+                                                     RbGrnDoubleArrayTrie *rb_grn_double_array_trie);
+
 void           rb_grn_column_bind                   (RbGrnColumn *rb_grn_column,
                                                      grn_ctx *context,
                                                      grn_obj *column);
@@ -576,11 +599,13 @@ VALUE          rb_grn_column_expression_builder_build
                                                     (VALUE self);
 
 
-#define RB_GRN_INTERN(string)         (ID2SYM(rb_intern(string)))
+#define RB_GRN_INTERN(c_string)       (rb_to_symbol(rb_str_new2(c_string)))
 
 #define RVAL2CBOOL(object)            (RTEST(object))
 #define CBOOL2RVAL(boolean)           ((boolean) ? Qtrue : Qfalse)
 
+#define RSYMBOL2CSTR(rb_symbol)       (RSTRING_PTR(rb_sym2str(rb_symbol)))
+
 #define RVAL2GRNENCODING(object, context) \
                                       (rb_grn_encoding_from_ruby_object(object, context))
 #define GRNENCODING2RVAL(encoding)    (rb_grn_encoding_to_ruby_object(encoding))

data/lib/groonga/record.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 # Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -278,9 +279,25 @@ module Groonga
       as_json.to_json(*args)
     end
 
-    # レコードを削除する。
+    # Delete the record.
     def delete
-      @table.delete(@id)
+      if support_key?
+        @table.delete(@id, :id => true)
+      else
+        @table.delete(@id)
+      end
+    end
+
+    # Renames key of the record. Only available for
+    # {Groonga::DoubleArrayTrie} table.
+    #
+    # @since 4.0.5
+    def rename(new_key)
+      if @table.is_a?(DoubleArrayTrie)
+        @table.update(@id, new_key, :id => true)
+      else
+        raise OperationNotSupported, "Only Groonga::DoubleArrayTrie table supports Groonga::Record#rename: <#{@table.class}>"
+      end
     end
 
     # レコードが所属するテーブルをロックする。ロックに失敗した場

data/lib/groonga/schema.rb

@@ -73,7 +73,7 @@ module Groonga
       def initialize(table, options)
         @table = table
         @options = options
-        super("creating table with differnt options: " +
+        super("creating table with different options: " +
               "#{@table.inspect}: #{@options.inspect}")
       end
     end
@@ -85,7 +85,7 @@ module Groonga
       def initialize(column, options)
         @column = column
         @options = options
-        super("creating column with differnt option: " +
+        super("creating column with different option: " +
               "#{@column.inspect}: #{@options.inspect}")
       end
     end

data/rroonga-build.rb

@@ -27,7 +27,7 @@ module RroongaBuild
   module LatestGroongaVersion
     MAJOR = 4
     MINOR = 0
-    MICRO = 5
+    MICRO = 6
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/rroonga.gemspec

@@ -54,12 +54,12 @@ Gem::Specification.new do |s|
   s.authors = authors
   s.email = emails
 
-  readme_path = File.join(base_dir, "README.textile")
-  entries = File.read(readme_path).split(/^h2\.\s(.*)$/)
+  readme_path = File.join(base_dir, "README.md")
+  entries = File.read(readme_path).split(/^##\s(.*)$/)
   description = clean_white_space.call(entries[entries.index("Description") + 1])
   s.summary, s.description, = description.split(/\n\n+/, 3)
 
-  s.files = ["README.textile", "AUTHORS", "Rakefile", "Gemfile", ".yardopts"]
+  s.files = ["README.md", "AUTHORS", "Rakefile", "Gemfile", ".yardopts"]
   s.files += Dir.glob("doc/text/*.textile")
   s.files += ["#{s.name}.gemspec"]
   s.files += ["rroonga-build.rb", "extconf.rb"]
@@ -67,7 +67,7 @@ Gem::Specification.new do |s|
     s.files += Dir.glob("{lib,benchmark,misc,example}/**/*.rb")
     s.files += Dir.glob("ext/**/*.{c,h,rb,def}")
     s.extensions = ["ext/groonga/extconf.rb"]
-    s.extra_rdoc_files = ["README.textile"]
+    s.extra_rdoc_files = ["README.md"]
     s.test_files = Dir.glob("test/**/*.rb")
     Dir.chdir("bin") do
       s.executables = Dir.glob("*")
@@ -85,7 +85,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("groonga-client", ">= 0.0.3")
   s.add_runtime_dependency("json")
   s.add_runtime_dependency("archive-zip")
-  s.add_development_dependency("test-unit", [">= 2.4.6"])
+  s.add_development_dependency("test-unit", [">= 3.0.0"])
   s.add_development_dependency("test-unit-notify")
   s.add_development_dependency("rake")
   s.add_development_dependency("rake-compiler")

data/test/test-column.rb

@@ -169,7 +169,7 @@ class ColumnTest < Test::Unit::TestCase
                  result.records.collect do |record|
                    record["body"]
                  end)
-    assert_equal("#<Groonga::Expression noname($1:\"\")" +
+    assert_equal("#<Groonga::Expression noname($1:null)" +
                  "{2body GET_VALUE,0\"drive\",0MATCH}>",
                  result.expression.inspect)
   end
@@ -200,7 +200,7 @@ class ColumnTest < Test::Unit::TestCase
                  result.records.collect do |record|
                    record["body"]
                  end)
-    assert_equal("#<Groonga::Expression noname($1:\"\")" +
+    assert_equal("#<Groonga::Expression noname($1:null)" +
                  "{2body GET_VALUE,0\"drive\",0MATCH}>",
                  result.expression.inspect)
   end
@@ -218,8 +218,8 @@ class ColumnTest < Test::Unit::TestCase
                  result.records.collect do |record|
                    record["body"]
                  end)
-    assert_equal("#<Groonga::Expression noname($1:\"\")" +
-                 "{0\"\",2body GET_VALUE,0\"drive\",0MATCH}>",
+    assert_equal("#<Groonga::Expression noname($1:null)" +
+                 "{0null,2body GET_VALUE,0\"drive\",0MATCH}>",
                  result.expression.inspect)
   end
 
@@ -233,8 +233,8 @@ class ColumnTest < Test::Unit::TestCase
                  result.records.collect do |record|
                    record["body"]
                  end)
-    assert_equal("#<Groonga::Expression noname($1:\"\")" +
-                 "{1\"\",2body GET_VALUE,0\"drive\",0MATCH}>",
+    assert_equal("#<Groonga::Expression noname($1:null)" +
+                 "{1null,2body GET_VALUE,0\"drive\",0MATCH}>",
                  result.expression.inspect)
   end
 

data/test/test-database.rb

@@ -90,13 +90,17 @@ class DatabaseTest < Test::Unit::TestCase
   def test_each
     setup_database
     default_object_names = @database.collect {|object| object.name}.sort
-    assert_send([default_object_names, :include?, "Bool"])
+    assert do
+      default_object_names.include?("Bool")
+    end
   end
 
   def test_each_without_block
     setup_database
     default_object_names = @database.each.collect {|object| object.name}.sort
-    assert_send([default_object_names, :include?, "Bool"])
+    assert do
+      default_object_names.include?("Bool")
+    end
   end
 
   def test_encoding

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

@@ -134,6 +134,24 @@ class DoubleArrayTrieTest < Test::Unit::TestCase
     assert_equal(expected, actual)
   end
 
+  def test_update_by_key
+    users = Groonga::DoubleArrayTrie.create(:name => "Users",
+                                            :key_type => "ShortText")
+    users.add("Bob")
+
+    users.update("Bob", "Alice")
+    assert_equal(["Alice"], users.collect {|user| user.key})
+  end
+
+  def test_update_by_id
+    users = Groonga::DoubleArrayTrie.create(:name => "Users",
+                                            :key_type => "ShortText")
+    users.add("Bob")
+
+    users.update(users["Bob"].id, "Alice", :id => true)
+    assert_equal(["Alice"], users.collect {|user| user.key})
+  end
+
   def test_add_uint_key
     numbers = Groonga::DoubleArrayTrie.create(:name => "Numbers",
                                               :key_type => "UInt32")

data/test/test-expression-builder.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 # Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -386,7 +387,7 @@ EOC
       result = @documents.select do |record|
         record.content.similar_search("fast full text search real time")
       end
-      assert_equal(["Groonga overview", "Column store and aggregate query"].sort,
+      assert_equal(["Groonga overview"],
                    result.collect {|record| record.key.key}.sort)
     end
 
@@ -394,7 +395,7 @@ EOC
       result = @documents.column("content").select do |content|
         content.similar_search("fast full text search real time")
       end
-      assert_equal(["Groonga overview", "Column store and aggregate query"].sort,
+      assert_equal(["Groonga overview"],
                    result.collect {|record| record.key.key}.sort)
     end
   end

data/test/test-hash.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 # Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -55,7 +56,7 @@ class HashTest < Test::Unit::TestCase
     end
 
     def test_id
-      @bookmarks.delete(@google.id)
+      @bookmarks.delete(@google.id, :id => true)
       assert_equal(["groonga", "Cutter"],
                    @bookmarks.collect {|bookmark| bookmark.key})
     end
@@ -73,6 +74,17 @@ class HashTest < Test::Unit::TestCase
       assert_equal(["Google", "Cutter"],
                    @bookmarks.collect {|bookmark| bookmark.key})
     end
+
+    def test_key_of_int32
+      numbers = Groonga::Hash.create(:name => "Numbers",
+                                     :key_type => "Int32")
+      numbers.add(100)
+      numbers.add(200)
+
+      numbers.delete(100)
+      assert_equal([200],
+                   numbers.collect {|number| number.key})
+    end
   end
 
   def test_value

data/test/test-plugin.rb

@@ -30,6 +30,8 @@ class PluginTest < Test::Unit::TestCase
   def test_system_plugins_dir
     suggest_plugin_path = "#{Groonga::Plugin.system_plugins_dir}/"
     suggest_plugin_path << "suggest/suggest#{Groonga::Plugin.suffix}"
-    assert_send([File, :exist?, suggest_plugin_path])
+    assert do
+      File.exist?(suggest_plugin_path)
+    end
   end
 end

data/test/test-record.rb

@@ -176,6 +176,15 @@ class RecordTest < Test::Unit::TestCase
     assert_equal(2, @bookmarks.size)
   end
 
+  def test_rename
+    users = Groonga::DoubleArrayTrie.create(:name => "DATUsers",
+                                            :key_type => "ShortText")
+    bob = users.add("Bob")
+
+    bob.rename("Alice")
+    assert_equal("Alice", bob._key)
+  end
+
   def test_key
     documents = Groonga::PatriciaTrie.create(:name => "Documents",
                                              :key_type => "ShortText")
@@ -625,6 +634,7 @@ class RecordTest < Test::Unit::TestCase
     end
 
     def test_to_json
+      ENV["TZ"] = "Japan"
       created_at = Time.parse("2013-05-16T16:57:34+09:00")
       values = {
         "uri"        => "http://groonga.org/",

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

@@ -79,9 +79,9 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     description = @users.define_column("description", "ShortText",
                                        :compress => :zlib)
     if context.support_zlib?
-      assert_send([description, :compressed?, :zlib])
+      assert {description.compressed?(:zlib)}
     else
-      assert_not_send([description, :compressed?, :zlib])
+      assert {not description.compressed?(:zlib)}
     end
   end
 
@@ -89,9 +89,9 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     description = @users.define_column("description", "ShortText",
                                        :compress => :lzo)
     if context.support_lzo?
-      assert_send([description, :compressed?, :lzo])
+      assert {description.compressed?(:lzo)}
     else
-      assert_not_send([description, :compressed?, :lzo])
+      assert {not description.compressed?(:lzo)}
     end
   end