rroonga 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6825aba9ca793b057d14d820baaed5905ee6d3c
-  data.tar.gz: 04afdec113a0f4ce8a913e163a835bbf7ef08e21
+  metadata.gz: 906eec26cd4e15e41fa821f5712aa677c379f100
+  data.tar.gz: 2bcd9e5ffbb3ea7b063d1f5b83f7ef211c7a1d87
 SHA512:
-  metadata.gz: 9a08bb595de1e37b7ca01135d39df767e846a1932cc45a8906aad3694c05f7f4e1c01da6723d287a3ca5537ee9e2a8a8cf218e4c9dce431ccc7eb085b0cb8aa2
-  data.tar.gz: d09efd27bf213100a22fcc71893eb8213e9b03aa1149645224ebf853b5c31a0ce215f1be7f7a7d2578f6f810b0f11c365f7fa7fb675c5f9100a94094e54c9174
+  metadata.gz: 8ab67483c99f8b0e5b29f60fdabe90966c57bb2b6a8c9302df32195c7fd25da4d1a12a1ab94f82f56e8cfdad2e1aa814fd3e03ecb70ff6fde6d6e3929441bb3d
+  data.tar.gz: e27e4a1c4e96f3c717959a6aa3935871e6a2824137538b833c9bfd74e831f90f11632f8027a5f8b4d4edc021571583d81b14343274856ab82fbf3694c902aa5f

data/doc/text/news.textile

@@ -1,5 +1,17 @@
 h1. NEWS
 
+h2(#3-0-9). 3.0.9: 2013-10-29
+
+h3. Improvements
+
+* Supported Groonga 3.0.9.
+* Supported showing error message on error in {Groonga::Object#remove}.
+
+h3. Fixes
+
+* Fixed a crash bug that is caused by assigning @nil@ as source of
+  index column.
+
 h2(#3-0-8). 3.0.8: 2013-09-29
 
 h3. Improvements
@@ -12,7 +24,7 @@ h2(#3-0-7). 3.0.7: 2013-09-19
 
 h3. Improvements
 
-* Added {Groonga::TableKeySupport#tokenize}. It requires groonga
+* Added {Groonga::Table::KeySupport#tokenize}. It requires groonga
   3.0.8. Groonga 3.0.8 is not released yet.
 * Changed return object of {Groonga::Context#select} to groonga-client gem's
   return object. It is a backward imcompatible change. Some APIs are changed.

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

@@ -657,6 +657,10 @@ resolve_source_id (grn_ctx *context, grn_obj *column, grn_id range_id,
             source = RVAL2GRNOBJECT(rb_source, &context);
         }
         rb_grn_context_check(context, rb_source);
+        if (!source) {
+            rb_raise(rb_eArgError, "couldn't find source: <%s>",
+                     rb_grn_inspect(rb_source));
+        }
         if (source->header.type == GRN_ACCESSOR) {
             char name[256];
             int length;

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

@@ -1436,15 +1436,14 @@ rb_grn_object_remove (VALUE self)
 {
     RbGrnObject *rb_grn_object;
     grn_ctx *context;
-    grn_rc rc;
 
     rb_grn_object = SELF(self);
     if (!rb_grn_object->object)
         return Qnil;
 
     context = rb_grn_object->context;
-    rc = grn_obj_remove(context, rb_grn_object->object);
-    rb_grn_rc_check(rc, self);
+    grn_obj_remove(context, rb_grn_object->object);
+    rb_grn_context_check(context, self);
 
     rb_iv_set(self, "@context", Qnil);
 

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 0
-#define RB_GRN_MICRO_VERSION 8
+#define RB_GRN_MICRO_VERSION 9
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 

data/lib/groonga/schema.rb

@@ -638,7 +638,7 @@ module Groonga
       def restore(dumped_text, options={})
         define(options) do |schema|
           schema.restore(dumped_text)
-	end
+        end
       end
 
       # @private

data/rroonga-build.rb

@@ -27,7 +27,7 @@ module RroongaBuild
   module LatestGroongaVersion
     MAJOR = 3
     MINOR = 0
-    MICRO = 8
+    MICRO = 9
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/rroonga.gemspec

@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
     s.extra_rdoc_files = ["README.textile"]
     s.test_files = Dir.glob("test/**/*.rb")
     Dir.chdir("bin") do
-      s.executables = Dir.glob("*") - ["groonga-index-validate"]
+      s.executables = Dir.glob("*")
     end
   end
 

data/test/test-database.rb

@@ -171,4 +171,78 @@ class DatabaseTest < Test::Unit::TestCase
     assert_equal(["HashTable", "PatriciaTrie", "DoubleArrayTrie"].sort,
                  @database.tables.collect(&:name).sort)
   end
+
+  class TestRemove < self
+    setup :setup_database
+
+    def test_referenced_table
+      Groonga::Schema.define do |schema|
+        schema.create_table("Names",
+                            :type => :hash,
+                            :key_type => :short_text) do |table|
+        end
+
+        schema.create_table("Shops",
+                            :type => :hash,
+                            :key_type => "Names") do |table|
+        end
+      end
+
+      path = @database.path
+      @database.remove
+      assert_false(File.exist?(path))
+    end
+
+    def test_referenced_column
+      Groonga::Schema.define do |schema|
+        schema.create_table("Categories",
+                            :type => :hash,
+                            :key_type => :short_text) do |table|
+        end
+
+        schema.create_table("Contents") do |table|
+          table.reference("category", "Categories")
+        end
+      end
+
+      path = @database.path
+      @database.remove
+      assert_false(File.exist?(path))
+    end
+
+    def test_indexed_table
+      Groonga::Schema.define do |schema|
+        schema.create_table("Categories",
+                            :type => :hash,
+                            :key_type => :short_text) do |table|
+        end
+
+        schema.create_table("Terms") do |table|
+          table.index("Categories._key")
+        end
+      end
+
+      path = @database.path
+      @database.remove
+      assert_false(File.exist?(path))
+    end
+
+    def test_indexed_column
+      Groonga::Schema.define do |schema|
+        schema.create_table("Categories",
+                            :type => :hash,
+                            :key_type => :short_text) do |table|
+          table.text("content")
+        end
+
+        schema.create_table("Terms") do |table|
+          table.index("Categories.content")
+        end
+      end
+
+      path = @database.path
+      @database.remove
+      assert_false(File.exist?(path))
+    end
+  end
 end

data/test/test-index-column.rb

@@ -320,4 +320,26 @@ class IndexColumnTest < Test::Unit::TestCase
                    ])
     end
   end
+
+  class SourceTest < self
+    def test_nil
+      Groonga::Schema.define do |schema|
+        schema.create_table("Contents",
+                            :type => :patricia_trie,
+                            :key_type => "ShortText") do |table|
+        end
+
+        schema.create_table("Terms",
+                            :type => :patricia_trie,
+                            :key_type => "ShortText",
+                            :default_tokenizer => "TokenBigram") do |table|
+        end
+      end
+
+      index = Groonga["Terms"].define_index_column("index", "Contents")
+      assert_raise(ArgumentError.new("couldn't find source: <nil>")) do
+        index.source = nil
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -194,8 +194,8 @@ email:
 - y.hayamizu@gmail.com
 - dara@shidara.net
 executables:
-- grntest-log-analyze
 - groonga-index-dump
+- grntest-log-analyze
 - grndump
 extensions:
 - ext/groonga/extconf.rb
@@ -206,135 +206,135 @@ files:
 - AUTHORS
 - Rakefile
 - Gemfile
-- doc/text/tutorial.textile
 - doc/text/news.textile
+- doc/text/tutorial.textile
 - rroonga.gemspec
 - rroonga-build.rb
 - extconf.rb
-- lib/groonga.rb
+- lib/groonga/schema.rb
+- lib/groonga/database.rb
 - lib/groonga/geo-point.rb
-- lib/groonga/logger.rb
-- lib/groonga/record.rb
-- lib/groonga/index-column.rb
+- lib/groonga/expression-builder-19.rb
 - lib/groonga/sub-records.rb
-- lib/groonga/view-record.rb
-- lib/groonga/memory-pool.rb
-- lib/groonga/context.rb
-- lib/groonga/grntest-log.rb
 - lib/groonga/pagination.rb
-- lib/groonga/database.rb
-- lib/groonga/schema.rb
-- lib/groonga/posting.rb
+- lib/groonga/index-column.rb
+- lib/groonga/view-record.rb
 - lib/groonga/patricia-trie.rb
-- lib/groonga/expression-builder.rb
 - lib/groonga/context/command-executor.rb
+- lib/groonga/grntest-log.rb
 - lib/groonga/dumper.rb
+- lib/groonga/posting.rb
+- lib/groonga/memory-pool.rb
 - lib/groonga/query-logger.rb
-- lib/groonga/expression-builder-19.rb
-- benchmark/create-wikipedia-database.rb
+- lib/groonga/context.rb
+- lib/groonga/record.rb
+- lib/groonga/expression-builder.rb
+- lib/groonga/logger.rb
+- lib/groonga.rb
 - benchmark/common.rb
-- benchmark/write-many-small-items.rb
+- benchmark/repeat-load.rb
 - benchmark/read-write-many-small-items.rb
+- benchmark/create-wikipedia-database.rb
+- benchmark/write-many-small-items.rb
 - benchmark/select.rb
-- benchmark/repeat-load.rb
 - misc/grnop2ruby.rb
 - example/index-html.rb
 - example/bookmark.rb
-- ext/groonga/rb-grn-exception.c
-- ext/groonga/rb-grn-hash-cursor.c
-- ext/groonga/rb-grn-record.c
+- ext/groonga/rb-grn-procedure.c
+- ext/groonga/rb-grn-column.c
+- ext/groonga/rb-grn-index-column.c
+- ext/groonga/rb-grn-encoding-support.c
 - ext/groonga/rb-grn-variable.c
+- ext/groonga/rb-grn-table.c
+- ext/groonga/rb-grn-hash-cursor.c
 - ext/groonga/rb-grn-table-cursor-key-support.c
+- ext/groonga/rb-grn-object.c
+- ext/groonga/rb-grn-double-array-trie.c
+- ext/groonga/rb-grn-table-key-support.c
+- ext/groonga/rb-grn-array.c
+- ext/groonga/rb-grn-patricia-trie.c
+- ext/groonga/rb-grn-double-array-trie-cursor.c
+- ext/groonga/rb-grn-utils.c
+- ext/groonga/rb-grn-record.c
 - ext/groonga/rb-grn-normalizer.c
-- ext/groonga/rb-grn-fix-size-column.c
-- ext/groonga/rb-grn-context.c
-- ext/groonga/rb-grn-plugin.c
-- ext/groonga/rb-grn-hash.c
+- ext/groonga/rb-groonga.c
+- ext/groonga/rb-grn-exception.c
 - ext/groonga/rb-grn-variable-size-column.c
-- ext/groonga/rb-grn-index-column.c
+- ext/groonga/rb-grn-encoding.c
+- ext/groonga/rb-grn-geo-point.c
+- ext/groonga/rb-grn-expression-builder.c
 - ext/groonga/rb-grn-operator.c
-- ext/groonga/rb-grn-table-key-support.c
-- ext/groonga/rb-grn-patricia-trie.c
-- ext/groonga/rb-grn-table-cursor.c
-- ext/groonga/rb-grn-object.c
-- ext/groonga/rb-grn-table.c
-- ext/groonga/rb-grn-procedure.c
 - ext/groonga/rb-grn-snippet.c
-- ext/groonga/rb-grn-encoding-support.c
-- ext/groonga/rb-grn-patricia-trie-cursor.c
-- ext/groonga/rb-grn-array.c
+- ext/groonga/rb-grn-array-cursor.c
+- ext/groonga/rb-grn-type.c
+- ext/groonga/rb-grn-table-cursor.c
+- ext/groonga/rb-grn-fix-size-column.c
+- ext/groonga/rb-grn-logger.c
+- ext/groonga/rb-grn-plugin.c
 - ext/groonga/rb-grn-database.c
-- ext/groonga/rb-grn-query-logger.c
-- ext/groonga/rb-grn-column.c
+- ext/groonga/rb-grn-patricia-trie-cursor.c
 - ext/groonga/rb-grn-index-cursor.c
-- ext/groonga/rb-grn-type.c
 - ext/groonga/rb-grn-accessor.c
-- ext/groonga/rb-grn-double-array-trie-cursor.c
+- ext/groonga/rb-grn-context.c
+- ext/groonga/rb-grn-query-logger.c
 - ext/groonga/rb-grn-posting.c
-- ext/groonga/rb-groonga.c
-- ext/groonga/rb-grn-geo-point.c
-- ext/groonga/rb-grn-array-cursor.c
-- ext/groonga/rb-grn-utils.c
-- ext/groonga/rb-grn-logger.c
 - ext/groonga/rb-grn-expression.c
-- ext/groonga/rb-grn-encoding.c
-- ext/groonga/rb-grn-expression-builder.c
-- ext/groonga/rb-grn-double-array-trie.c
+- ext/groonga/rb-grn-hash.c
 - ext/groonga/rb-grn.h
 - ext/groonga/extconf.rb
 - ext/groonga/groonga.def
+- test/test-normalizer.rb
+- test/test-schema.rb
+- test/test-vector-column.rb
+- test/test-schema-dumper.rb
+- test/run-test.rb
+- test/test-procedure.rb
+- test/test-hash.rb
+- test/test-expression.rb
+- test/test-version.rb
 - test/test-remote.rb
-- test/test-accessor.rb
-- test/test-database-dumper.rb
-- test/test-index-column.rb
-- test/groonga-test-utils.rb
-- test/test-pagination.rb
+- test/test-table-offset-and-limit.rb
+- test/test-expression-builder.rb
+- test/test-sub-records.rb
+- test/test-encoding.rb
+- test/test-snippet.rb
+- test/test-index-cursor.rb
+- test/test-type.rb
+- test/test-table-dumper.rb
+- test/test-table-traverse.rb
+- test/test-convert.rb
 - test/test-table.rb
+- test/test-pagination.rb
+- test/groonga-test-utils.rb
+- test/test-logger.rb
+- test/test-context.rb
 - test/test-memory-pool.rb
-- test/test-variable-size-column.rb
+- test/test-table-select-weight.rb
+- test/test-exception.rb
+- test/test-table-select-normalize.rb
+- test/test-command-select.rb
+- test/test-gqtp.rb
+- test/test-database-dumper.rb
+- test/test-index-column.rb
+- test/test-geo-point.rb
 - test/test-plugin.rb
-- test/test-hash.rb
-- test/test-table-traverse.rb
-- test/test-encoding.rb
+- test/test-variable-size-column.rb
 - test/test-schema-create-table.rb
-- test/test-type.rb
+- test/test-array.rb
+- test/test-fix-size-column.rb
 - test/test-table-key-support.rb
-- test/test-database.rb
-- test/test-variable.rb
+- test/test-schema-type.rb
 - test/test-table-select.rb
-- test/test-patricia-trie.rb
-- test/test-geo-point.rb
-- test/test-expression-builder.rb
-- test/test-logger.rb
-- test/test-array.rb
-- test/test-record.rb
+- test/test-variable.rb
 - test/test-column.rb
-- test/test-fix-size-column.rb
-- test/run-test.rb
-- test/test-procedure.rb
-- test/test-table-dumper.rb
-- test/test-schema.rb
+- test/test-patricia-trie.rb
 - test/test-table-select-mecab.rb
-- test/test-command-select.rb
-- test/test-table-select-normalize.rb
-- test/test-expression.rb
-- test/test-normalizer.rb
-- test/test-vector-column.rb
-- test/test-version.rb
-- test/test-index-cursor.rb
+- test/test-accessor.rb
+- test/test-database.rb
 - test/test-double-array-trie.rb
-- test/test-exception.rb
-- test/test-schema-dumper.rb
-- test/test-schema-type.rb
-- test/test-table-select-weight.rb
-- test/test-convert.rb
-- test/test-gqtp.rb
-- test/test-context.rb
-- test/test-snippet.rb
-- test/test-table-offset-and-limit.rb
-- test/test-sub-records.rb
-- bin/grntest-log-analyze
+- test/test-record.rb
 - bin/groonga-index-dump
+- bin/grntest-log-analyze
 - bin/grndump
 homepage: http://groonga.rubyforge.org/#about-rroonga
 licenses:
@@ -363,54 +363,54 @@ specification_version: 4
 summary: Ruby bindings for groonga that provide full text search and column store
   features.
 test_files:
+- test/test-normalizer.rb
+- test/test-schema.rb
+- test/test-vector-column.rb
+- test/test-schema-dumper.rb
+- test/run-test.rb
+- test/test-procedure.rb
+- test/test-hash.rb
+- test/test-expression.rb
+- test/test-version.rb
 - test/test-remote.rb
-- test/test-accessor.rb
-- test/test-database-dumper.rb
-- test/test-index-column.rb
-- test/groonga-test-utils.rb
-- test/test-pagination.rb
+- test/test-table-offset-and-limit.rb
+- test/test-expression-builder.rb
+- test/test-sub-records.rb
+- test/test-encoding.rb
+- test/test-snippet.rb
+- test/test-index-cursor.rb
+- test/test-type.rb
+- test/test-table-dumper.rb
+- test/test-table-traverse.rb
+- test/test-convert.rb
 - test/test-table.rb
+- test/test-pagination.rb
+- test/groonga-test-utils.rb
+- test/test-logger.rb
+- test/test-context.rb
 - test/test-memory-pool.rb
-- test/test-variable-size-column.rb
+- test/test-table-select-weight.rb
+- test/test-exception.rb
+- test/test-table-select-normalize.rb
+- test/test-command-select.rb
+- test/test-gqtp.rb
+- test/test-database-dumper.rb
+- test/test-index-column.rb
+- test/test-geo-point.rb
 - test/test-plugin.rb
-- test/test-hash.rb
-- test/test-table-traverse.rb
-- test/test-encoding.rb
+- test/test-variable-size-column.rb
 - test/test-schema-create-table.rb
-- test/test-type.rb
+- test/test-array.rb
+- test/test-fix-size-column.rb
 - test/test-table-key-support.rb
-- test/test-database.rb
-- test/test-variable.rb
+- test/test-schema-type.rb
 - test/test-table-select.rb
-- test/test-patricia-trie.rb
-- test/test-geo-point.rb
-- test/test-expression-builder.rb
-- test/test-logger.rb
-- test/test-array.rb
-- test/test-record.rb
+- test/test-variable.rb
 - test/test-column.rb
-- test/test-fix-size-column.rb
-- test/run-test.rb
-- test/test-procedure.rb
-- test/test-table-dumper.rb
-- test/test-schema.rb
+- test/test-patricia-trie.rb
 - test/test-table-select-mecab.rb
-- test/test-command-select.rb
-- test/test-table-select-normalize.rb
-- test/test-expression.rb
-- test/test-normalizer.rb
-- test/test-vector-column.rb
-- test/test-version.rb
-- test/test-index-cursor.rb
+- test/test-accessor.rb
+- test/test-database.rb
 - test/test-double-array-trie.rb
-- test/test-exception.rb
-- test/test-schema-dumper.rb
-- test/test-schema-type.rb
-- test/test-table-select-weight.rb
-- test/test-convert.rb
-- test/test-gqtp.rb
-- test/test-context.rb
-- test/test-snippet.rb
-- test/test-table-offset-and-limit.rb
-- test/test-sub-records.rb
+- test/test-record.rb
 has_rdoc: