rroonga 6.0.7 → 6.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 266ed1c5524c3ecf7a34caae961511c166f83fdc
-  data.tar.gz: a9bc9f5db05f31e635d521e265a8ea170371ac67
+  metadata.gz: 27152bea7491ed0ab3718bffaf842ba2b67d4d4a
+  data.tar.gz: e4dd8295421d9d2dac4e3d5e55a00a5e8ba6eb3a
 SHA512:
-  metadata.gz: ba0d58609159717163d7cdc66bce45dda47d80a8e4ef27a670569edf8073c12ac5d7da3bcd1efea7ac8ac85fed33e047188728650b34c50a2260e960a0dbe209
-  data.tar.gz: d43410abb91b18bae1fc4da6f39e0dd160b8d02394dc64e6e0d95c54b90c42708dfc6f2482ad054eae5a85b36cb98f2f9b82ceef84e7e8b70faba3c3852e1372
+  metadata.gz: bff37ac4de03009e14cd3807ede281f537dd732ee49462e025834fc1ffd50543b9f53a4da2ef11ba872849add51ff398326f45bad53453a2062fc8ab99b34c55
+  data.tar.gz: 5d73e5004237396c788a3765393999f19739a8453d4e1e2b21edcaa2fcd3c818595ab036ae9e26cd306a86bfff4c6f34b2f5a6357840dccaf47cfc6f3c014d14

data/doc/text/cross-compile.md

@@ -1,14 +1,30 @@
-How to Cross compile Rroonga
-===
+# How to Cross compile Rroonga
 
-# For Debian GNU/Linux like Linux distribution Users
+## For rake-compiler-dock
 
-## apt
+`rake-compiler-dock` depends `docker` and some platform requires docker client such as `docker-machine`.
+Please install `docker` and docker client before cross compiling with `rake-compiler-dock`.
+
+### cross compiling with rake-compiler-dock
+
+execute following rake task:
+
+```bash
+$ bundle exec rake build:windows
+```
+
+Then, `pkg` directory is created. And cross compiled gems move into `pkg` directory.
+
+## Manual procedure for Debian GNU/Linux like Linux distribution Users
+
+This is the manual procedure without rake-compiler-dock.
+
+### apt
 
 * mingw-w64
 * build-essential
 
-## prepare ruby and rubygems
+### prepare ruby and rubygems
 
 ```bash
 $ rbenv install 1.9.3-p547
@@ -21,7 +37,7 @@ $ rbenv install 2.1.3
 $ gem install bundler
 ```
 
-## bundle install
+### bundle install
 
 ```bash
 $ rbenv local 1.9.3-p547
@@ -32,7 +48,7 @@ $ rbenv local 2.1.3
 $ bundle install [--path vendor/bundle]
 ```
 
-## rake-compiler
+### rake-compiler
 
 ```bash
 $ rbenv local 1.9.3-p547
@@ -46,7 +62,7 @@ $ bundle exec rake-compiler cross-ruby HOST=i686-w64-mingw32 VERSION=2.1.3 [EXTS
 $ bundle exec rake-compiler cross-ruby HOST=x86_64-w64-mingw32 VERSION=2.1.3 [EXTS=--without-extensions]
 ```
 
-## cross compile
+### cross compile
 
 ```bash
 $ rbenv local 1.9.3-p547
@@ -55,18 +71,3 @@ $ bundle exec rake RUBY_CC_VERSION=1.9.3:2.0.0:2.1.3 cross clean native gem
 $ bundle exec rake clean:groonga
 $ bundle exec rake RUBY_CC_VERSION=1.9.3:2.0.0:2.1.3 cross RROONGA_USE_GROONGA_X64=true clean native gem
 ```
-
-# For rake-compiler-dock
-
-`rake-compiler-dock` depends `docker` and some platform requires docker client such as `docker-machine`.
-Please install `docker` and docker client before cross compiling with `rake-compiler-dock`.
-
-## cross compiling with rake-compiler-dock
-
-execute following rake task:
-
-```bash
-$ bundle exec rake build:windows
-```
-
-Then, `pkg` directory is created. And cross compiled gems move into `pkg` directory.

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # NEWS
 
+## 6.0.9: 2016-10-07 {#version-6-0-9}
+
+### Improvements
+
+  * Supported Groonga 6.0.9. Groonga 6.0.8 or older aren't supported.
+  * {Groonga::Database#remove_force}: Added a new method that removes
+    broken object.
+  * {Groonga::ID.builtin_type?}: Added a new predicate method that checks
+    whether the given ID is ID for builtin_type object or not.
+
 ## 6.0.7: 2016-08-13 {#version-6-0-7}
 
 ### Improvements

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

@@ -705,6 +705,38 @@ rb_grn_database_reindex (VALUE self)
     return Qnil;
 }
 
+/*
+ * Removes a broken object.
+ *
+ * You should use {Groonga::Object#remove} normally.
+ *
+ * @overload remove_force(name)
+ *
+ *   @param [String] name The target object name.
+ *
+ * @since 6.0.9
+ */
+static VALUE
+rb_grn_database_remove_force (VALUE self, VALUE rb_name)
+{
+    grn_rc rc;
+    grn_ctx *context;
+    char *name;
+    int name_size;
+
+    rb_grn_database_deconstruct(SELF(self), NULL, &context,
+                                NULL, NULL, NULL, NULL);
+
+    name = StringValueCStr(rb_name);
+    name_size = RSTRING_LEN(rb_name);
+
+    rc = grn_obj_remove_force(context, name, name_size);
+    rb_grn_context_check(context, self);
+    rb_grn_rc_check(rc, self);
+
+    return Qnil;
+}
+
 void
 rb_grn_init_database (VALUE mGrn)
 {
@@ -740,4 +772,5 @@ rb_grn_init_database (VALUE mGrn)
     rb_define_method(rb_cGrnDatabase, "recover", rb_grn_database_recover, 0);
     rb_define_method(rb_cGrnDatabase, "unmap", rb_grn_database_unmap, 0);
     rb_define_method(rb_cGrnDatabase, "reindex", rb_grn_database_reindex, 0);
+    rb_define_method(rb_cGrnDatabase, "remove_force", rb_grn_database_remove_force, 1);
 }

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

@@ -42,6 +42,24 @@ rb_grn_id_s_builtin_p (VALUE self, VALUE rb_id)
     return CBOOL2RVAL(grn_id_is_builtin(ctx, id));
 }
 
+/*
+ * @overload builtin_type?(id)
+ *   @param [Integer] id The ID to be confirmed.
+ *   @return [Boolean] `true` if the `id` is builtin_type, `false` otherwise.
+ *
+ * @since 6.0.9
+ */
+static VALUE
+rb_grn_id_s_builtin_type_p (VALUE self, VALUE rb_id)
+{
+    grn_ctx *ctx = NULL;
+    grn_id id;
+
+    id = NUM2INT(rb_id);
+
+    return CBOOL2RVAL(grn_id_is_builtin_type(ctx, id));
+}
+
 void
 rb_grn_init_id (VALUE mGrn)
 {
@@ -53,4 +71,5 @@ rb_grn_init_id (VALUE mGrn)
     rb_define_const(mGrnID, "MAX", INT2NUM(GRN_ID_MAX));
 
     rb_define_singleton_method(mGrnID, "builtin?", rb_grn_id_s_builtin_p, 1);
+    rb_define_singleton_method(mGrnID, "builtin_type?", rb_grn_id_s_builtin_type_p, 1);
 }

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

@@ -583,6 +583,7 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
     grn_ctx *context = NULL;
     grn_obj *table;
     grn_obj *columns;
+    grn_obj *key_type;
     grn_rc rc;
     int n;
     grn_table_cursor *cursor;
@@ -603,8 +604,9 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
         name_size = RSTRING_LEN(rb_name);
     }
 
+    key_type = grn_ctx_at(context, GRN_DB_SHORT_TEXT);
     columns = grn_table_create(context, NULL, 0, NULL, GRN_TABLE_HASH_KEY,
-                               NULL, 0);
+                               key_type, 0);
     rb_grn_context_check(context, self);
     n = grn_table_columns(context, table, name, name_size, columns);
     rb_grn_context_check(context, self);

data/ext/groonga/rb-grn.h

@@ -99,7 +99,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 6
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 7
+#define RB_GRN_MICRO_VERSION 9
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

data/rroonga-build.rb

@@ -18,15 +18,15 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 6
     MINOR = 0
-    MICRO = 7
+    MICRO = 9
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2016, 7, 29)
+    RELEASED_DATE = Time.utc(2016, 9, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 6
     MINOR = 0
-    MICRO = 7
+    MICRO = 9
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-database.rb

@@ -276,6 +276,27 @@ class DatabaseTest < Test::Unit::TestCase
                  terms.collect(&:_key).sort)
   end
 
+  def test_remove_force
+    setup_database
+    table_name = "Bookmarks"
+    table = Groonga::Array.create(:name => table_name)
+    table_path = Pathname.new(table.path)
+    @database.unmap
+    table_path.open("w") do |file|
+      file.print("BROKEN")
+    end
+    assert_raise(Groonga::IncompatibleFileFormat) do
+      context[table_name]
+    end
+    assert do
+      table_path.exist?
+    end
+    @database.remove_force(table_name)
+    assert do
+      not table_path.exist?
+    end
+  end
+
   class RemoveTest < self
     setup :setup_database
 
@@ -377,7 +398,6 @@ class DatabaseTest < Test::Unit::TestCase
     end
 
     def test_dirty?
-      omit("TODO: Enable this after Groonga 6.0.6 is released.")
       assert do
         not @database.dirty?
       end

data/test/test-id.rb

@@ -44,4 +44,20 @@ class IDTest < Test::Unit::TestCase
       end
     end
   end
+
+  sub_test_case(".builtin_type?") do
+    test "true" do
+      assert do
+        Groonga::ID.builtin_type?(Groonga::Type::INT32)
+      end
+    end
+
+    test "false" do
+      token_bigram_id = Groonga["TokenBigram"].id
+
+      assert do
+        not Groonga::ID.builtin_type?(token_bigram_id)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 6.0.7
+  version: 6.0.9
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-13 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -194,10 +194,10 @@ email:
 - y.hayamizu@gmail.com
 - dara@shidara.net
 executables:
-- grntest-log-analyze
+- groonga-index-dump
 - groonga-database-inspect
 - grndump
-- groonga-index-dump
+- grntest-log-analyze
 extensions:
 - ext/groonga/extconf.rb
 extra_rdoc_files:
@@ -417,72 +417,72 @@ specification_version: 4
 summary: Ruby bindings for Groonga that provide full text search and column store
   features.
 test_files:
-- test/test-context.rb
-- test/test-normalizer.rb
-- test/test-double-array-trie.rb
-- test/test-token-regexp.rb
-- test/test-remote.rb
-- test/test-expression.rb
-- test/test-schema-dumper.rb
-- test/test-patricia-trie.rb
-- test/test-table-group.rb
-- test/test-table-select.rb
-- test/test-encoding.rb
-- test/test-windows-event-logger.rb
 - test/test-plugin.rb
-- test/test-table-select-normalize.rb
-- test/test-hash.rb
-- test/test-gqtp.rb
-- test/test-table-dumper.rb
-- test/test-data-column.rb
-- test/test-pagination.rb
-- test/test-column.rb
-- test/test-table-traverse.rb
-- test/test-type.rb
-- test/test-package-label.rb
-- test/groonga-test-utils.rb
-- test/test-thread.rb
-- test/test-procedure.rb
 - test/test-query-logger.rb
-- test/test-index-column.rb
-- test/test-vector-column.rb
-- test/test-fix-size-column.rb
-- test/test-error-message.rb
-- test/test-operator.rb
-- test/test-database-dumper.rb
-- test/run-test.rb
+- test/test-table-select.rb
+- test/test-table-offset-and-limit.rb
+- test/test-token-regexp.rb
+- test/test-sub-records.rb
 - test/test-index-cursor.rb
-- test/test-schema-type.rb
-- test/test-database.rb
-- test/test-id.rb
+- test/test-convert.rb
 - test/test-request-canceler.rb
-- test/test-logger.rb
-- test/test-table.rb
-- test/test-record.rb
 - test/test-version.rb
-- test/test-table-select-mecab.rb
-- test/test-lock-timeout.rb
-- test/test-table-select-weight.rb
-- test/test-geo-point.rb
-- test/test-array.rb
 - test/test-request-timer.rb
-- test/test-sub-records.rb
+- test/test-table.rb
+- test/test-lock-timeout.rb
 - test/test-schema-create-table.rb
+- test/test-index-column.rb
+- test/test-fix-size-column.rb
+- test/test-table-dumper.rb
+- test/test-array.rb
+- test/test-record.rb
+- test/test-schema-dumper.rb
+- test/test-variable-size-column.rb
+- test/test-type.rb
+- test/test-pagination.rb
+- test/test-database-dumper.rb
+- test/test-table-group.rb
+- test/test-accessor.rb
 - test/test-name.rb
-- test/test-schema.rb
-- test/test-command-select.rb
+- test/test-database.rb
+- test/test-database-inspector.rb
+- test/test-operator.rb
+- test/test-procedure.rb
 - test/test-expression-builder.rb
-- test/test-convert.rb
-- test/test-memory-pool.rb
-- test/test-flushable.rb
-- test/test-table-offset-and-limit.rb
-- test/test-exception.rb
-- test/test-variable-size-column.rb
+- test/test-command-select.rb
+- test/test-double-array-trie.rb
 - test/test-config.rb
+- test/test-vector-column.rb
+- test/test-encoding.rb
 - test/test-table-key-support.rb
-- test/test-database-inspector.rb
-- test/test-variable.rb
+- test/test-gqtp.rb
+- test/run-test.rb
+- test/test-patricia-trie.rb
+- test/test-remote.rb
+- test/test-table-select-weight.rb
+- test/test-windows-event-logger.rb
 - test/test-statistic-measurer.rb
+- test/test-logger.rb
+- test/test-package-label.rb
+- test/test-hash.rb
+- test/test-schema-type.rb
+- test/test-error-message.rb
+- test/test-normalizer.rb
+- test/test-flushable.rb
 - test/test-snippet.rb
-- test/test-accessor.rb
+- test/test-thread.rb
+- test/test-variable.rb
+- test/test-memory-pool.rb
+- test/test-id.rb
+- test/test-data-column.rb
+- test/test-exception.rb
+- test/test-table-select-mecab.rb
+- test/test-table-select-normalize.rb
+- test/test-schema.rb
+- test/test-geo-point.rb
+- test/test-table-traverse.rb
+- test/groonga-test-utils.rb
+- test/test-column.rb
+- test/test-context.rb
+- test/test-expression.rb
 has_rdoc: