rroonga 5.0.4-x64-mingw32 → 5.0.5-x64-mingw32

data/vendor/local/lib/groonga/plugins/sharding/logical_shard_list.rb

@@ -0,0 +1,28 @@
+module Groonga
+  module Sharding
+    class LogicalShardListCommand < Command
+      register("logical_shard_list",
+               [
+                 "logical_table",
+               ])
+
+      def run_body(input)
+        enumerator = LogicalEnumerator.new("logical_shard_list",
+                                           input,
+                                           :require_shard_key => false)
+        shard_names = enumerator.collect do |current_shard, shard_range|
+          current_shard.table_name
+        end
+
+        writer.array("shards", shard_names.size) do
+          shard_names.each do |shard_name|
+            writer.map("shard", 1) do
+              writer.write("name")
+              writer.write(shard_name)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/local/lib/groonga/plugins/sharding/logical_table_remove.rb

@@ -15,20 +15,25 @@ module Groonga
         enumerator = LogicalEnumerator.new("logical_table_remove", input)
 
         succeess = true
-        enumerator.each do |table, shard_key, shard_range|
-          remove_table(table,
-                       shard_key,
-                       shard_range,
-                       enumerator.target_range)
+        enumerator.each do |shard, shard_range|
+          remove_table(shard, shard_range, enumerator.target_range)
         end
         writer.write(succeess)
       end
 
       private
-      def remove_table(table, shard_key, shard_range, target_range)
+      def remove_table(shard, shard_range, target_range)
         cover_type = target_range.cover_type(shard_range)
         return if cover_type == :none
 
+        shard_key = shard.key
+        if shard_key.nil?
+          message = "[logical_table_remove] shard_key doesn't exist: " +
+                    "<#{shard.key_name}>"
+          raise InvalidArgument, message
+        end
+        table = shard.table
+
         expression_builder = RangeExpressionBuilder.new(shard_key,
                                                         target_range,
                                                         nil)

data/vendor/local/lib/groonga/plugins/sharding/parameters.rb

@@ -0,0 +1,10 @@
+module Groonga
+  module Sharding
+    module Parameters
+      @range_index = :auto
+      class << self
+        attr_accessor :range_index
+      end
+    end
+  end
+end

data/vendor/local/lib/groonga/plugins/suggest/suggest.la

@@ -17,7 +17,7 @@ old_library='suggest.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -lpthread -llz4 -lz -lws2_32 /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/suggest'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/suggest'

data/vendor/local/lib/groonga/plugins/table/table.la

@@ -17,7 +17,7 @@ old_library='table.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -lpthread -llz4 -lz -lws2_32 /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/table'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/table'

data/vendor/local/lib/groonga/plugins/token_filters/stop_word.la

@@ -17,7 +17,7 @@ old_library='stop_word.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -lpthread -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/token_filters'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/token_filters'

data/vendor/local/lib/groonga/plugins/tokenizers/mecab.la

@@ -17,7 +17,7 @@ old_library='mecab.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmecab.la -lpthread /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmecab.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -lpthread -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/tokenizers'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/tokenizers'

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

@@ -20,9 +20,39 @@ module Groonga
       @writer ||= context.writer
     end
 
+    def query_logger
+      @query_logger ||= context.query_logger
+    end
+
+    def cache_key(input)
+      nil
+    end
+
+    def cache_output(key, options={})
+      if key.nil?
+        yield
+      else
+        cache = Cache.current
+        cached_value = cache.fetch(key)
+        if cached_value
+          context.output = cached_value
+          cache.unref(key)
+          query_logger.log(:cache, ":", "cache(#{cached_value.bytesize})")
+        else
+          yield
+          cache.update(key, context.output) if options[:update]
+        end
+      end
+    end
+
     def run_internal(input)
       begin
-        run_body(input)
+        options = {
+          :update => (input["cache"] != "no"),
+        }
+        cache_output(cache_key(input), options) do
+          run_body(input)
+        end
       rescue GroongaError => groonga_error
         context.set_groonga_error(groonga_error)
         nil

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

@@ -16,6 +16,10 @@ module Groonga
       @logger ||= Logger.new
     end
 
+    def query_logger
+      @query_logger ||= QueryLogger.new
+    end
+
     def writer
       @writer ||= Writer.new
     end
@@ -24,16 +28,28 @@ module Groonga
       set_error_raw(groonga_error.class.rc,
                     ErrorLevel::ERROR,
                     groonga_error.message,
-                    groonga_error.backtrace)
+                    # TODO: Re-enable backtrace after mruby/mruby#2917 has been merged
+                    nil) # groonga_error.backtrace)
     end
 
     def record_error(rc, error)
       rc = RC.find(rc) if rc.is_a?(Symbol)
-      set_error_raw(rc, ErrorLevel::ERROR, error.message, error.backtrace)
+      # TODO: Re-enable backtrace after mruby/mruby#2917 has been merged
+      set_error_raw(rc, ErrorLevel::ERROR, error.message, nil) # error.backtrace)
 
       logger.log_error(error)
     end
 
+    def with_command_version(version)
+      old_version = command_version
+      begin
+        self.command_version = version
+        yield
+      ensure
+        self.command_version = old_version
+      end
+    end
+
     private
     def set_error_raw(rc, error_level, message, backtrace)
       self.rc = rc.to_i

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

@@ -13,8 +13,7 @@ module Groonga
       end
     end
 
-    def each_table(options={})
-      context = Context.instance
+    def each_name(options={})
       min = options[:prefix]
       flags = 0
       if options[:order] == :descending
@@ -30,10 +29,19 @@ module Groonga
       flags |= TableCursorFlags::PREFIX if min
       TableCursor.open(self, :min => min, :flags => flags) do |cursor|
         cursor.each do |id|
-          object = context[id]
-          yield(object) if object.is_a?(Table)
+          name = cursor.key
+          yield(name)
         end
       end
     end
+
+    def each_table(options={})
+      context = Context.instance
+      each_name(options) do |name|
+        next if name.include?(".")
+        object = context[name]
+        yield(object) if object.is_a?(Table)
+      end
+    end
   end
 end

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

@@ -11,43 +11,46 @@ module Groonga
       data_list = builder.build
       return @table_size if data_list.nil?
 
-      or_data_list = group_data_list(data_list)
-      or_sizes = or_data_list.collect do |and_data_list|
-        and_sizes = and_data_list.collect do |data|
-          size = estimate_data(data)
-          if data.logical_op == Operator::AND_NOT
-            size = @table_size - size
-            size = 0 if size < 0
-          end
-          size
-        end
-        and_sizes.min
-      end
-      or_sizes.max
-    end
-
-    private
-    def group_data_list(data_list)
-      or_data_list = [[]]
+      current_size = 0
+      sizes = []
       data_list.each do |data|
-        next if data.op == Operator::NOP
-
-        and_data_list = or_data_list.last
-        if and_data_list.empty?
-          and_data_list << data
-        else
+        if (data.flags & ScanInfo::Flags::POP) != 0
+          size = sizes.pop
           case data.logical_op
           when Operator::AND, Operator::AND_NOT
-            and_data_list << data
+            current_size = size if size < current_size
+          when Operator::OR
+            current_size = size if size > current_size
           else
-            and_data_list = [data]
-            or_data_list << and_data_list
+            message = "invalid logical operator: <#{data.logical_op.inspect}>"
+            raise InvalidArgument, message
+          end
+        else
+          if (data.flags & ScanInfo::Flags::PUSH) != 0
+            sizes.push(current_size)
+            current_size = 0
+          end
+
+          size = estimate_data(data)
+          case data.logical_op
+          when Operator::AND
+            current_size = size if size < current_size
+          when Operator::AND_NOT
+            size = @table_size - size
+            size = 0 if size < 0
+            current_size = size if size < current_size
+          when Operator::OR
+            current_size = size if size > current_size
+          else
+            message = "invalid logical operator: <#{data.logical_op.inspect}>"
+            raise InvalidArgument, message
           end
         end
       end
-      or_data_list
+      current_size
     end
 
+    private
     def estimate_data(data)
       search_index = data.search_indexes.first
       return @table_size if search_index.nil?

data/vendor/local/lib/groonga/scripts/ruby/initialize/post.rb

@@ -7,6 +7,7 @@ require "writer"
 require "object"
 require "database"
 require "table"
+require "record"
 require "index_column"
 require "command"
 require "table_cursor"

data/vendor/local/lib/groonga/scripts/ruby/logger/level.rb

@@ -2,8 +2,10 @@ module Groonga
   class Logger
     class Level
       @@names = {}
-      def self.find(name)
-        @@names[name]
+      class << self
+        def find(name)
+          @@names[name]
+        end
       end
 
       attr_reader :name

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

@@ -0,0 +1,9 @@
+module Groonga
+  class QueryLogger
+    def log(flag, mark, message)
+      flag = Flag.find(flag) if flag.is_a?(Symbol)
+      flag = flag.to_i if flag.is_a?(Flag)
+      log_raw(flag, mark, message)
+    end
+  end
+end

data/vendor/local/lib/groonga/scripts/ruby/query_logger/flag.rb

@@ -0,0 +1,39 @@
+module Groonga
+  class QueryLogger
+    class Flag
+      @@names = {}
+      class << self
+        def find(name)
+          @@names[name]
+        end
+      end
+
+      attr_reader :name
+      def initialize(name, flag)
+        @@names[name] = self
+        @name = name
+        @flag = flag
+      end
+
+      def to_i
+        @flag
+      end
+
+      NONE        = new(:none,        0x00)
+      COMMAND     = new(:command,     0x01 << 0)
+      RESULT_CODE = new(:result_code, 0x01 << 1)
+      DESTINATION = new(:destination, 0x01 << 2)
+      CACHE       = new(:cache,       0x01 << 3)
+      SIZE        = new(:size,        0x01 << 4)
+      SCORE       = new(:score,       0x01 << 5)
+
+      all_flags = COMMAND.to_i |
+                  RESULT_CODE.to_i |
+                  DESTINATION.to_i |
+                  CACHE.to_i |
+                  SIZE.to_i |
+                  SCORE.to_i
+      ALL         = new(:all,         all_flags)
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Groonga
+  class Record
+    attr_reader :table
+    attr_reader :id
+
+    def inspect
+      super.gsub(/>\z/) do
+        "@id=#{@id.inspect}, @table=#{@table.inspect}>"
+      end
+    end
+  end
+end