rroonga 5.0.2-x86-mingw32 → 5.0.3-x86-mingw32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTc4YTc4OWNhMjIyODYxNDI3NjA2M2I5NTE5ZGU0YTEwNzM1NjAzYg==
+    OGI0MjgxYzZlNzE3MTU4MTlhOWM2MjkyMDkzNTM1MzU1YmY5M2Y1ZQ==
   data.tar.gz: !binary |-
-    MjY3OWQ5Yjc2NTJlODk0ZGJiOWU0MDEwMWIzNjY0ZWYxZWRjOWRlZQ==
+    NTM2OTNlZDhkZWUzMjRkNGVlMjk2YWQ0MmQ4M2YwNTA3YjgwZWY1OQ==
 SHA512:
   metadata.gz: !binary |-
-    MDg3ZGMwY2RmMDA1ODcxOTI3OTA1MTdkNmM1Nzk2NzUyNzI0ZDM4YTY2ZGY4
-    NWU2Mjk3Y2E0MjA2M2YwMzYwMzBmMTU5MTI3MGQ4Nzc0MDlhNDcxZTkwZTRh
-    NWFkYjYyMWVmYjJjNzRlYTU2MTRhYTYyYTY5NTQ0NTdiY2E3NzU=
+    OTdlZWNjNTEyNjJiMTU1MjgwZTU2ZmI1ZWRmMTk5Mzg5Y2E0YWI5NTVlODBl
+    ZWNlYzJiYzFmMzM5ZmNiZTJkMGJiYWJiNWZiODFiMGI1NGExMTg3MDYyMDU5
+    MjBkYzBhNGQyOGE0MGFlMWViNDllZTI0Y2VjNDE5ZDZiMWVjZGY=
   data.tar.gz: !binary |-
-    MmYzYzhhYjkyOGYzZTdjMTcxMzNmNjY1NDQyN2I2YWU2Y2E1OWI3YzRiMDY1
-    ODk2ODNhMjE5NDRkNzFmYjk4ZTk0ZjY4ZGVlYTgyNDUyMzEzOTNmOGQ4NTQ1
-    MDc0MjNlOTY2MDEwYTFlZWUxZjU5ZDA3YzgyMWRjMTI1YTQyOTg=
+    OGNlNzk0MjdiZDBiZGQ0NTc5NDc2MTYxNzkzZDk4N2FjMjg0OTIyNWQyODFj
+    NjU4MTM3Nzk0Mjk2YjRmYjZmMjllMDU4Yjc3YTMyZTQ4MDY4NWQ1OGQ5N2Fk
+    ZWJlYTY0ODYzN2FjMDJjYjY4NTIyOWVhMjA3OTExOGVlZjkxNWI=

data/README.md

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

data/bin/groonga-database-inspect

@@ -35,6 +35,11 @@ parser.on("--no-columns",
           "Don't show column information") do |boolean|
   options.show_columns = boolean
 end
+parser.on("--log-path=PATH",
+          "Specify log path",
+          "(#{Groonga::Logger.path})") do |path|
+  Groonga::Logger.path = path
+end
 args = parser.parse!(ARGV)
 
 if args.size != 1

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

@@ -166,7 +166,7 @@ rb_grn_logger_s_log (int argc, VALUE *argv, VALUE klass)
     VALUE rb_file;
     const char *file = NULL;
     VALUE rb_line;
-    int line;
+    int line = 0;
     VALUE rb_function;
     const char *function = NULL;
     VALUE rb_options;

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

@@ -611,6 +611,7 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
 
     columns = grn_table_create(context, NULL, 0, NULL, GRN_TABLE_HASH_KEY,
                                NULL, 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

@@ -101,7 +101,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 5
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 2
+#define RB_GRN_MICRO_VERSION 3
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 

data/lib/groonga/database-inspector.rb

@@ -89,6 +89,10 @@ module Groonga
       end
 
       private
+      def push_memory_pool(&block)
+        @database.context.push_memory_pool(&block)
+      end
+
       def report_plugins
         write("Plugins:\n")
         indent do
@@ -158,6 +162,20 @@ module Groonga
         indent do
           write("ID:         #{column.id}\n")
           write("Type:       #{inspect_column_type(column)}\n")
+          if column.index?
+            sources = column.sources
+            write("N sources:  #{sources.size}\n")
+            unless sources.empty?
+              write("Sources:\n")
+              indent do
+                sources.each do |source|
+                  write("Name:     #{inspect_source(source)}\n")
+                end
+              end
+            end
+          else
+            write("Value type: #{inspect_value_type(column.range)}\n")
+          end
           write("Path:       #{inspect_path(column.path)}\n")
           write("Disk usage: #{inspect_sub_disk_usage(column.disk_usage)}\n")
         end
@@ -222,7 +240,9 @@ module Groonga
 
       def count_total_n_columns
         @database.tables.inject(0) do |previous, table|
-          previous + table.columns.size
+          push_memory_pool do
+            previous + table.columns.size
+          end
         end
       end
 
@@ -237,8 +257,10 @@ module Groonga
       end
 
       def count_total_table_disk_usage(table)
-        table.columns.inject(table.disk_usage) do |previous, column|
-          previous + column.disk_usage
+        push_memory_pool do
+          table.columns.inject(table.disk_usage) do |previous, column|
+            previous + column.disk_usage
+          end
         end
       end
 
@@ -265,6 +287,14 @@ module Groonga
         end
       end
 
+      def inspect_value_type(range)
+        if range.nil?
+          "(no value)"
+        else
+          range.name
+        end
+      end
+
       def inspect_tokenizer(table)
         if table.support_key?
           tokenizer = table.default_tokenizer
@@ -300,6 +330,14 @@ module Groonga
           "scalar"
         end
       end
+
+      def inspect_source(source)
+        if source.is_a?(Table)
+          "#{source.name}._key"
+        else
+          source.name
+        end
+      end
     end
   end
 end

data/rroonga-build.rb

@@ -22,13 +22,13 @@ module RroongaBuild
     MINOR = 0
     MICRO = 3
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2015, 3, 31)
+    RELEASED_DATE = Time.utc(2015, 4, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 5
     MINOR = 0
-    MICRO = 3
+    MICRO = 4
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/rroonga.gemspec

@@ -78,7 +78,6 @@ Gem::Specification.new do |s|
   s.homepage = "http://ranguba.org/#about-rroonga"
   s.licenses = ["LGPL-2.1"]
   s.require_paths = ["lib", "ext/groonga"]
-  s.rubyforge_project = "groonga"
 
   s.required_ruby_version = ">= 1.9.3"
 

data/test/test-database-inspector.rb

@@ -144,6 +144,7 @@ class DatabaseInspectorTest < Test::Unit::TestCase
         #{column.local_name}:
           ID:         #{column.id}
           Type:       #{inspect_column_type(column)}
+          Value type: #{inspect_value_type(column.range)}
           Path:       <#{column.path}>
           Disk usage: #{inspect_sub_disk_usage(column.disk_usage)}
     INSPECTED
@@ -164,6 +165,14 @@ class DatabaseInspectorTest < Test::Unit::TestCase
     end
   end
 
+  def inspect_value_type(range)
+    if range.nil?
+      "(no value)"
+    else
+      range.name
+    end
+  end
+
   class DatabaseTest < self
     def test_empty
       assert_equal(<<-INSPECTED, report)
@@ -713,10 +722,58 @@ Database
       end
 
       def inspected(type)
+        if type == "index"
+          sources = @column.sources
+          additional_info = "  N sources:  #{sources.size}\n"
+          additional_info << "  Sources:\n"
+          source_names = sources.collect do |source|
+            "    Name:     #{source.name}"
+          end
+          additional_info << source_names.join("\n")
+        else
+          additional_info = "  Value type: #{@column.range.name}"
+        end
         <<-INSPECTED
 #{@column.local_name}:
   ID:         #{@column.id}
   Type:       #{type}
+#{additional_info}
+  Path:       <#{@column.path}>
+  Disk usage: #{inspect_sub_disk_usage(@column.disk_usage)}
+        INSPECTED
+      end
+    end
+
+    class SourceTest < self
+      def test_key
+        Groonga::Schema.create_table("Users",
+                                     :type => :patricia_trie,
+                                     :key_type => "ShortText") do |table|
+        end
+        Groonga::Schema.create_table("Terms",
+                                     :type => :patricia_trie,
+                                     :key_type => "ShortText",
+                                     :default_tokenizer => "TokenBigram",
+                                     :normalizer => "NormalizerAuto") do |table|
+          table.index("Users._key")
+        end
+        @table = Groonga["Terms"]
+        @column = @table.columns.first
+        assert_equal(inspected(["Users._key"]), report)
+      end
+
+      private
+      def inspected(source_names)
+        inspected_sources = "  N sources:  #{source_names.size}\n"
+        inspected_sources << "  Sources:\n"
+        source_names.each do |source_name|
+          inspected_sources << "    Name:     #{source_name}\n"
+        end
+        <<-INSPECTED
+#{@column.local_name}:
+  ID:         #{@column.id}
+  Type:       index
+#{inspected_sources.chomp}
   Path:       <#{@column.path}>
   Disk usage: #{inspect_sub_disk_usage(@column.disk_usage)}
         INSPECTED

data/test/test-database.rb

@@ -70,6 +70,8 @@ class DatabaseTest < Test::Unit::TestCase
   end
 
   def test_new
+    # TODO: remove the line when Groonga 5.0.5 released.
+    omit("This test is failing on Groonga 5.0.4.") if Groonga.version == "5.0.4"
     assert_raise(Groonga::NoSuchFileOrDirectory) do
       new_context = Groonga::Context.new
       Groonga::Database.new(@database_path.to_s, :context => new_context)

data/vendor/local/lib/groonga/scripts/ruby/expression_size_estimator.rb

@@ -99,7 +99,12 @@ module Groonga
 
     def estimate_equal(data, index_column)
       lexicon = index_column.lexicon
-      term_id = lexicon[data.query]
+      query = data.query
+      if query.domain == lexicon.id
+        term_id = query.value
+      else
+        term_id = lexicon[query]
+      end
       return 0 if term_id.nil?
 
       index_column.estimate_size(:term_id => term_id)

data/vendor/local/lib/pkgconfig/groonga.pc

@@ -11,10 +11,10 @@ pluginsdir=${libdir}/groonga/plugins
 groonga=${bindir}/groonga.exe
 groonga_httpd=${sbindir}/groonga-httpd.exe
 groonga_suggest_create_dataset=${bindir}/groonga-suggest-create-dataset.exe
-groonga_version=5.0.3
+groonga_version=5.0.4
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 5.0.3
+Version: 5.0.4
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga