rroonga 4.0.7-x64-mingw32 → 4.0.8-x64-mingw32

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 00882b4e6fd873fc8ae74cf36d0795d36ec72aff
-  data.tar.gz: b10a63452da0149c8af43c8ae3ad132499efe2a9
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzIyMmY2N2ZmZTRmMzRiYTJhMWJmMDU1YjE3N2IzMTc4MjJmZDJkNg==
+  data.tar.gz: !binary |-
+    NTcwMDRkYWJiNTYyMTMxNGM2ZWY1ODFkNTIyNzMyZDNjNmQxNGRlYQ==
 SHA512:
-  metadata.gz: b3e4e15326531f0b7666d70da10dfbc36a4376e2427522966d5363c8f27aee3d67d9f713a60e47896e0e2803e561c7146fa01355b889360d78c886adf70560f6
-  data.tar.gz: c8d0bcdb5126cac3a7834781cbe09bbdf470f4b62ec0fbdfc9bb55f23c6810abdc78a43323e1aa20b0461c3226587ac4c34f77f4d41bd2ecda90412f2e6132f9
+  metadata.gz: !binary |-
+    ZjlmNDc2YjMxMzEyZGMyZWY1ODY5MDRjZWJhZTcxZDA3NTc0NjFlMDJmM2Rl
+    NWQwMzA2NWRlZjJmNTFkZTU5M2MxZjAzNzQ1MzRiNTc2NzBiMjM4YjU4MjRl
+    YzU0NzU2OTRjYTVmYTYyZGI4ZDlkMzMxNTNkM2Y2NGVjZmIxNTU=
+  data.tar.gz: !binary |-
+    ZDhhNjBmNWM4MWM4YWU0ODUxYWUwOTY5NWJmY2Y2MGNlZGI0ZTVkOTgzMTNi
+    ZmI2NjJiN2E1ZjhmY2Y3MDM3ZjQyNzVjNDM5MzNlMDg5ODhmZjQ2OWRmYjVj
+    ZDcwNzhjZmQ0ODEzNDJhMzFlMWI5NDFiZGM2ODJjM2ViOWY3YzE=

data/README.md

@@ -40,7 +40,7 @@ contributed patches.)
 ## Dependencies
 
 * Ruby >= 1.9.3
-* Groonga >= 4.0.7
+* Groonga >= 4.0.9
 
 ## Install
 

data/doc/text/news.textile

@@ -1,5 +1,21 @@
 h1. NEWS
 
+h2(#4-0-8). 4.0.8: 2014-01-08
+
+h3. Improvements
+
+* Supported Groonga 4.0.9. Groonga 4.0.8 or older aren't supported.
+* Added {Groonga::Column#truncate}. [GitHub#41] [Patch by Hiroshi Hatake]
+* Added {Groonga::Database#recover}.
+
+h3. Fixes
+
+* Fixed a typo in {Groonga::GeoPoint#==}.
+
+h3. Thanks
+
+* Hiroshi Hatake
+
 h2(#4-0-7). 4.0.7: 2014-12-12
 
 h3. Improvements
@@ -9,7 +25,7 @@ h3. Improvements
   {Groonga::IndexCursor#each}. The option improves performance by
   reducing memory allocation. The option is disabled by default because
   reusing the same object isn't Rubyish.
-* Added {Groonga::IndexCursor#estimate_size}. [GitHub#38]
+* Added {Groonga::IndexColumn#estimate_size}. [GitHub#38]
 * Accepted string for integer, unsigned integer and float type key.
 
 h2(#4-0-6). 4.0.6: 2014-11-06

data/ext/groonga/extconf.rb

@@ -192,8 +192,9 @@ def build_groonga_from_git(major, minor, micro)
   FileUtils.rm_rf("groonga")
   message(" done\n")
 
+  repository_url = "https://github.com/groonga/groonga.git"
   run_command("cloning...",
-              "git clone --depth 1 https://github.com/groonga/groonga")
+              "git clone --recursive --depth 1 #{repository_url}")
 
   Dir.chdir("groonga") do
     run_command("running autogen.sh...",

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

@@ -608,6 +608,36 @@ rb_grn_column_reference_p (VALUE self)
     }
 }
 
+/*
+ * Clears all values in column.
+ *
+ * This method is a dangerous method. You can't use this method when
+ * other process is using the column. The other process that is using
+ * the column must re-open its database after this method is done.
+ *
+ * @since 4.0.8
+ *
+ * @overload truncate
+ *   @return void
+ */
+static VALUE
+rb_grn_column_truncate (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *column;
+    grn_rc rc;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, NULL,
+                              NULL, NULL, NULL);
+    rc = grn_column_truncate(context, column);
+
+    rb_grn_context_check(context, self);
+    rb_grn_rc_check(rc, self);
+
+    return Qnil;
+}
+
 /*
  * _column_ が {Groonga::IndexColumn} の場合は +true+ を返し、
  * そうでない場合は +false+ を返す。
@@ -802,6 +832,7 @@ rb_grn_init_column (VALUE mGrn)
     rb_define_method(rb_cGrnColumn, "clear_lock", rb_grn_column_clear_lock, -1);
     rb_define_method(rb_cGrnColumn, "locked?", rb_grn_column_is_locked, -1);
     rb_define_method(rb_cGrnColumn, "reference?", rb_grn_column_reference_p, 0);
+    rb_define_method(rb_cGrnColumn, "truncate", rb_grn_column_truncate, 0);
     /* deprecated: backward compatibility */
     rb_define_alias(rb_cGrnColumn, "reference_column?", "reference?");
     rb_define_method(rb_cGrnColumn, "index?", rb_grn_column_index_p, 0);

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2015  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
@@ -562,6 +562,37 @@ rb_grn_database_defrag (int argc, VALUE *argv, VALUE self)
     return INT2NUM(n_segments);
 }
 
+/*
+ * Recovers database.
+ *
+ * @overload recover()
+ *
+ *   If the database is broken, try to recover the database. If the
+ *   database can't be recovered, an {Groonga::Error} family exception
+ *   is raised.
+ *
+ *   If the database isn't broken, it does nothing.
+ *
+ *   @return [void]
+ *
+ * @since 4.0.8
+ */
+static VALUE
+rb_grn_database_recover (VALUE self)
+{
+    grn_rc rc;
+    grn_ctx *context;
+    grn_obj *database;
+
+    rb_grn_database_deconstruct(SELF(self), &database, &context,
+                                NULL, NULL, NULL, NULL);
+    rc = grn_db_recover(context, database);
+    rb_grn_context_check(context, self);
+    rb_grn_rc_check(rc, self);
+
+    return Qnil;
+}
+
 void
 rb_grn_init_database (VALUE mGrn)
 {
@@ -593,4 +624,5 @@ rb_grn_init_database (VALUE mGrn)
 
     rb_define_method(rb_cGrnDatabase, "touch", rb_grn_database_touch, 0);
     rb_define_method(rb_cGrnDatabase, "defrag", rb_grn_database_defrag, -1);
+    rb_define_method(rb_cGrnDatabase, "recover", rb_grn_database_recover, 0);
 }

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

@@ -2184,7 +2184,7 @@ rb_grn_table_select (int argc, VALUE *argv, VALUE self)
         if (!NIL_P(options))
             rb_raise(rb_eArgError,
                      "should be [query_string, option_hash], "
-                     "[expression, opion_hash] "
+                     "[expression, option_hash] "
                      "or [option_hash]: %s",
                      rb_grn_inspect(rb_ary_new4(argc, argv)));
         options = condition_or_options;

data/ext/groonga/rb-grn.h

@@ -92,7 +92,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 4
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 7
+#define RB_GRN_MICRO_VERSION 8
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 

data/lib/groonga/geo-point.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -136,7 +137,7 @@ module Groonga
     def ==(other)
       case other
       when String
-        to_s == otehr
+        to_s == other
       when GeoPoint
         normalized_self = to_msec
         normalized_other = coerce(other).to_msec

data/rroonga-build.rb

@@ -19,15 +19,15 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 4
     MINOR = 0
-    MICRO = 8
+    MICRO = 9
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2014, 11, 29)
+    RELEASED_DATE = Time.utc(2014, 12, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 4
     MINOR = 0
-    MICRO = 8
+    MICRO = 9
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-column.rb

@@ -172,7 +172,7 @@ class ColumnTest < Test::Unit::TestCase
     assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
 #<Groonga::Expression #<expr
   vars:{
-    $1:#<record:hash:Posts id:0(nonexistent)>
+    $1:#<record:hash:Posts id:(no value)>
   },
   codes:{
     0:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
@@ -212,7 +212,7 @@ class ColumnTest < Test::Unit::TestCase
     assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
 #<Groonga::Expression #<expr
   vars:{
-    $1:#<record:hash:Posts id:0(nonexistent)>
+    $1:#<record:hash:Posts id:(no value)>
   },
   codes:{
     0:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
@@ -239,10 +239,10 @@ class ColumnTest < Test::Unit::TestCase
     assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
 #<Groonga::Expression #<expr
   vars:{
-    $1:#<record:hash:Posts id:0(nonexistent)>
+    $1:#<record:hash:Posts id:(no value)>
   },
   codes:{
-    0:<push(), modify:0, value:#<record:hash:Posts id:0(nonexistent)>>,
+    0:<push(), modify:0, value:#<record:hash:Posts id:(no value)>>,
     1:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
     2:<push(), modify:0, value:"drive">,
     3:<match(), modify:0, value:(NULL)>
@@ -264,10 +264,10 @@ class ColumnTest < Test::Unit::TestCase
     assert_equal(<<-INSPECTED.chomp, result.expression.inspect)
 #<Groonga::Expression #<expr
   vars:{
-    $1:#<record:hash:Posts id:0(nonexistent)>
+    $1:#<record:hash:Posts id:(no value)>
   },
   codes:{
-    0:<push(), modify:1, value:#<record:hash:Posts id:0(nonexistent)>>,
+    0:<push(), modify:1, value:#<record:hash:Posts id:(no value)>>,
     1:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>,
     2:<push(), modify:0, value:"drive">,
     3:<match(), modify:0, value:(NULL)>
@@ -518,4 +518,66 @@ class ColumnTest < Test::Unit::TestCase
       assert_nil(@users.column("name"))
     end
   end
+
+  class TruncateTest < self
+    def setup
+      setup_database
+
+      setup_schema
+    end
+
+    def setup_schema
+      Groonga::Schema.define do |schema|
+        schema.create_table("Posts",
+                            :type => :hash,
+                            :key_type => "ShortText") do |table|
+          table.text("body")
+        end
+      end
+
+      @posts = Groonga["Posts"]
+    end
+
+    def test_not_indexed
+      body1 = "body1"
+      body2 = "body2"
+      records = [
+        @posts.add("title1", :body => body1),
+        @posts.add("title2", :body => body2),
+      ]
+
+      assert_equal([body1, body2],
+                   records.collect(&:body))
+      @posts.column("body").truncate
+      assert_equal([nil, nil],
+                   records.collect(&:body))
+    end
+
+    def test_indexed
+      Groonga::Schema.define do |schema|
+        schema.create_table("Terms",
+                            :type => :patricia_trie,
+                            :key_type => "ShortText",
+                            :default_tokenizer => "TokenBigram",
+                            :normalizer => "NormalizerAuto") do |table|
+          table.index("Posts.body")
+        end
+      end
+
+      post1 = @posts.add("title1", :body => "body1")
+      post2 = @posts.add("title2", :body => "body2")
+
+      select = lambda do
+        @posts.select {|record| record.body =~ "1"}.collect(&:_key)
+      end
+
+      assert_equal(["title1"], select.call)
+      @posts.column("body").truncate
+      assert_equal([], select.call)
+
+      post1.body = "body1"
+      post2.body = "body2"
+      assert_equal(["title1"], select.call)
+    end
+  end
 end

data/test/test-command-select.rb

@@ -202,8 +202,6 @@ class CommandSelectTest < Test::Unit::TestCase
   end
 
   class EscapeTest < self
-    setup :setup_database
-
     def test_backslash
       key = "the \\ book"
       @books.add(key, :published => Time.parse("2011/04/01"))
@@ -234,5 +232,4 @@ class CommandSelectTest < Test::Unit::TestCase
                    result.records)
     end
   end
-
 end

data/test/test-database.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2015  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
@@ -171,6 +171,33 @@ class DatabaseTest < Test::Unit::TestCase
     assert_equal(2, @database.defrag)
   end
 
+  def test_recover
+    setup_database
+    Groonga::Schema.define do |schema|
+      schema.create_table("Users") do |table|
+        table.short_text("name")
+      end
+
+      schema.create_table("Terms",
+                          :type => :patricia_trie,
+                          :key_type => :short_text,
+                          :default_tokenizer => "TokenBigram",
+                          :normalizer => "NormalizerAuto") do |table|
+        table.index("Users.name")
+      end
+    end
+
+    index = context["Terms.Users_name"]
+    index.lock
+    assert do
+      index.locked?
+    end
+    @database.recover
+    assert do
+      not index.locked?
+    end
+  end
+
   def test_tables
     setup_database
     Groonga::Schema.define do |schema|

data/test/test-expression-builder.rb

@@ -569,7 +569,7 @@ EOC
       result = @bookmarks.select do |record|
         record.user.pet.name == "morita Bob"
       end
-      assert_equal(["http://groonga.org/", "http://ruby-lang.org/", "http://dic.nicovideo.jp/"],
+      assert_equal(["http://groonga.org/", "http://ruby-lang.org/"],
                    result.collect {|record| record["uri"]})
     end
   end

data/test/test-geo-point.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -185,6 +186,20 @@ class GeoPointTest < Test::Unit::TestCase
           assert_equal(geo_point1, geo_point2)
         end
       end
+
+      class StringTest < self
+        def test_degree
+          geo_point1 = Groonga::WGS84GeoPoint.new(35.6846084, 139.7628746)
+          geo_point2 = "35.6846084x139.7628746"
+          assert_equal(geo_point1, geo_point2)
+        end
+
+        def test_msec
+          geo_point1 = Groonga::WGS84GeoPoint.new(128464590, 503146349)
+          geo_point2 = "128464590x503146349"
+          assert_equal(geo_point1, geo_point2)
+        end
+      end
     end
   end
 end

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

@@ -145,7 +145,7 @@ class VariableSizeColumnTest < Test::Unit::TestCase
 
     class StringTest < self
       def test_append
-        omit("append for non table domain column isn't supported by groonga.")
+        omit("append for non table domain column isn't supported by Groonga.")
         assert_equal([], @morita["nick_names"])
         @morita.append("nick_names", "morita")
         assert_equal(["morita"], @morita["nick_names"])
@@ -154,7 +154,7 @@ class VariableSizeColumnTest < Test::Unit::TestCase
       end
 
       def test_prepend
-        omit("prepend for non table domain column isn't supported by groonga.")
+        omit("prepend for non table domain column isn't supported by Groonga.")
         assert_equal([], @morita["nick_names"])
         @morita.prepend("nick_names", "morita")
         assert_equal(["morita"], @morita["nick_names"])