rroonga 5.0.1-x64-mingw32 → 5.0.2-x64-mingw32

data/vendor/local/include/msgpack_fwd.hpp

@@ -0,0 +1,28 @@
+/*
+ * MessagePack for C++ version switcher
+ *
+ * Copyright (C) 2014 KONDO Takatoshi
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#ifndef MSGPACK_FWD_HPP
+#define MSGPACK_FWD_HPP
+
+#include "msgpack/versioning.hpp"
+#include "msgpack/zone.hpp"
+#include "msgpack/object_fwd.hpp"
+#include "msgpack/iterator.hpp"
+#include "msgpack/adaptor/define.hpp"
+#include "msgpack/pack.hpp"
+
+#endif // MSGPACK_FWD_HPP

data/vendor/local/lib/groonga/plugins/functions/vector.la

@@ -0,0 +1,41 @@
+# vector.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='vector.dll'
+
+# Names of this library.
+library_names='vector.dll.a'
+
+# The name of the static archive.
+old_library='vector.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for vector.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/functions'

data/vendor/local/lib/groonga/plugins/query_expanders/tsv.la

@@ -17,7 +17,7 @@ old_library='tsv.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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -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/query_expanders'
+libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/query_expanders'

data/vendor/local/lib/groonga/plugins/ruby/eval.la

@@ -17,7 +17,7 @@ old_library='eval.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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kenhys/work/groonga/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/ruby'
+libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/ruby'

data/vendor/local/lib/groonga/plugins/ruby/load.la

@@ -17,7 +17,7 @@ old_library='load.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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kenhys/work/groonga/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/ruby'
+libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/ruby'

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

@@ -1,3 +1,4 @@
+require "sharding/range_expression_builder"
 require "sharding/logical_enumerator"
 require "sharding/logical_count"
 require "sharding/logical_range_filter"

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

@@ -32,96 +32,68 @@ module Groonga
         cover_type = target_range.cover_type(shard_range)
         return 0 if cover_type == :none
 
+        expression_builder = RangeExpressionBuilder.new(shard_key,
+                                                        target_range,
+                                                        filter)
         if cover_type == :all
           if filter.nil?
             return table.size
           else
-            return filtered_count_n_records(table, filter)
+            return filtered_count_n_records(table) do |expression|
+              expression_builder.build_all(expression)
+            end
           end
         end
 
-        use_range_index = false
         range_index = nil
         if filter.nil?
           index_info = shard_key.find_index(Operator::LESS)
           if index_info
             range_index = index_info.index
-            use_range_index = true
           end
         end
 
         case cover_type
         when :partial_min
-          if use_range_index
+          if range_index
             count_n_records_in_range(range_index,
                                      target_range.min, target_range.min_border,
                                      nil, nil)
           else
-            filtered_count_n_records(table, filter) do |expression|
-              expression.append_object(shard_key, Operator::PUSH, 1)
-              expression.append_operator(Operator::GET_VALUE, 1)
-              expression.append_constant(target_range.min, Operator::PUSH, 1)
-              if target_range.min_border == :include
-                expression.append_operator(Operator::GREATER_EQUAL, 2)
-              else
-                expression.append_operator(Operator::GREATER, 2)
-              end
+            filtered_count_n_records(table) do |expression|
+              expression_builder.build_partial_min(expression)
             end
           end
         when :partial_max
-          if use_range_index
+          if range_index
             count_n_records_in_range(range_index,
                                      nil, nil,
                                      target_range.max, target_range.max_border)
           else
-            filtered_count_n_records(table, filter) do |expression|
-              expression.append_object(shard_key, Operator::PUSH, 1)
-              expression.append_operator(Operator::GET_VALUE, 1)
-              expression.append_constant(target_range.max, Operator::PUSH, 1)
-              if target_range.max_border == :include
-                expression.append_operator(Operator::LESS_EQUAL, 2)
-              else
-                expression.append_operator(Operator::LESS, 2)
-              end
+            filtered_count_n_records(table) do |expression|
+              expression_builder.build_partial_max(expression)
             end
           end
         when :partial_min_and_max
-          if use_range_index
+          if range_index
             count_n_records_in_range(range_index,
                                      target_range.min, target_range.min_border,
                                      target_range.max, target_range.max_border)
           else
-            filtered_count_n_records(table, filter) do |expression|
-              expression.append_object(context["between"], Operator::PUSH, 1)
-              expression.append_object(shard_key, Operator::PUSH, 1)
-              expression.append_operator(Operator::GET_VALUE, 1)
-              expression.append_constant(target_range.min, Operator::PUSH, 1)
-              expression.append_constant(target_range.min_border,
-                                         Operator::PUSH, 1)
-              expression.append_constant(target_range.max, Operator::PUSH, 1)
-              expression.append_constant(target_range.max_border,
-                                         Operator::PUSH, 1)
-              expression.append_operator(Operator::CALL, 5)
+            filtered_count_n_records(table) do |expression|
+              expression_builder.build_partial_min_and_max(expression)
             end
           end
         end
       end
 
-      def filtered_count_n_records(table, filter)
+      def filtered_count_n_records(table)
         expression = nil
         filtered_table = nil
 
         begin
           expression = Expression.create(table)
-          if block_given?
-            yield(expression)
-            if filter
-              expression.parse(filter)
-              expression.append_operator(Operator::AND, 2)
-            end
-          else
-            expression.parse(filter)
-          end
+          yield(expression)
           filtered_table = table.select(expression)
           filtered_table.size
         ensure

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

@@ -10,12 +10,21 @@ module Groonga
         initialize_parameters
       end
 
-      def each
+      def each(&block)
+        each_internal(:ascending, &block)
+      end
+
+      def reverse_each(&block)
+        each_internal(:descending, &block)
+      end
+
+      private
+      def each_internal(order)
         prefix = "#{@logical_table}_"
         context = Context.instance
         context.database.each_table(:prefix => prefix,
                                     :order_by => :key,
-                                    :order => :ascending) do |table|
+                                    :order => order) do |table|
           shard_range_raw = table.name[prefix.size..-1]
 
           next unless /\A(\d{4})(\d{2})(\d{2})\z/ =~ shard_range_raw
@@ -143,10 +152,10 @@ module Groonga
 
           return true if @min_border == :exclude
 
-          @min.hour != 0 and
-            @min.min != 0 and
-            @min.sec != 0 and
-            @min.usec != 0
+          not (@min.hour == 0 and
+               @min.min  == 0 and
+               @min.sec  == 0 and
+               @min.usec == 0)
         end
 
         def in_max?(shard_range)

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

@@ -35,8 +35,19 @@ module Groonga
             if first_result_set
               writer.write_table_columns(first_result_set, output_columns)
             end
+            limit = context.limit
+            if limit < 0
+              n_records = result_sets.inject(0) do |n, result_set|
+                n + result_set.size
+              end
+              limit = n_records + limit + 1
+            end
+            options = {}
             result_sets.each do |result_set|
-              writer.write_table_records(result_set, output_columns)
+              options[:limit] = limit
+              writer.write_table_records(result_set, output_columns, options)
+              limit -= result_set.size
+              break if limit <= 0
             end
           end
         ensure
@@ -63,7 +74,7 @@ module Groonga
           @offset = (@input[:offset] || 0).to_i
           @limit = (@input[:limit] || 10).to_i
 
-          @current_offset = 0
+          @current_offset = @offset
           @current_limit = @limit
 
           @result_sets = []
@@ -101,7 +112,7 @@ module Groonga
 
         def compute_threshold
           threshold_env = ENV["GRN_LOGICAL_RANGE_FILTER_THRESHOLD"]
-          default_threshold = 0.000058 # 15000 / 259200000.0
+          default_threshold = 0.2
           (threshold_env || default_threshold).to_f
         end
       end
@@ -114,7 +125,12 @@ module Groonga
         def execute
           first_table = nil
           enumerator = @context.enumerator
-          enumerator.each do |table, shard_key, shard_range|
+          if @context.order == :descending
+            each_method = :reverse_each
+          else
+            each_method = :each
+          end
+          enumerator.send(each_method) do |table, shard_key, shard_range|
             first_table ||= table
             next if table.empty?
 
@@ -152,6 +168,10 @@ module Groonga
           @target_range = @context.enumerator.target_range
 
           @cover_type = @target_range.cover_type(@shard_range)
+
+          @expression_builder = RangeExpressionBuilder.new(@shard_key,
+                                                           @target_range,
+                                                           @filter)
         end
 
         def execute
@@ -175,7 +195,7 @@ module Groonga
                               nil, nil)
             else
               filter_table do |expression|
-                build_expression_partial_min(expression)
+                @expression_builder.build_partial_min(expression)
               end
             end
           when :partial_max
@@ -185,7 +205,7 @@ module Groonga
                               @target_range.max, @target_range.max_border)
             else
               filter_table do |expression|
-                build_expression_partial_max(expression)
+                @expression_builder.build_partial_max(expression)
               end
             end
           when :partial_min_and_max
@@ -195,76 +215,30 @@ module Groonga
                               @target_range.max, @target_range.max_border)
             else
               filter_table do |expression|
-                build_expression_partial_min_and_max(expression)
+                @expression_builder.build_partial_min_and_max(expression)
               end
             end
           end
         end
 
         private
-        def build_expression_all(expression)
-          expression.parse(@filter)
-        end
-
-        def build_expression_partial_min(expression)
-          expression.append_object(@shard_key, Operator::PUSH, 1)
-          expression.append_operator(Operator::GET_VALUE, 1)
-          expression.append_constant(@target_range.min, Operator::PUSH, 1)
-          if @target_range.min_border == :include
-            expression.append_operator(Operator::GREATER_EQUAL, 2)
-          else
-            expression.append_operator(Operator::GREATER, 2)
-          end
-          if @filter
-            expression.parse(@filter)
-            expression.append_operator(Operator::AND, 2)
-          end
-        end
-
-        def build_expression_partial_max(expression)
-          expression.append_object(@shard_key, Operator::PUSH, 1)
-          expression.append_operator(Operator::GET_VALUE, 1)
-          expression.append_constant(@target_range.max, Operator::PUSH, 1)
-          if @target_range.max_border == :include
-            expression.append_operator(Operator::LESS_EQUAL, 2)
-          else
-            expression.append_operator(Operator::LESS, 2)
-          end
-          if @filter
-            expression.parse(@filter)
-            expression.append_operator(Operator::AND, 2)
-          end
-        end
-
-        def build_expression_partial_min_and_max(expression)
-          between = Groonga::Context.instance["between"]
-          expression.append_object(between, Operator::PUSH, 1)
-          expression.append_object(@shard_key, Operator::PUSH, 1)
-          expression.append_operator(Operator::GET_VALUE, 1)
-          expression.append_constant(@target_range.min, Operator::PUSH, 1)
-          expression.append_constant(@target_range.min_border,
-                                     Operator::PUSH, 1)
-          expression.append_constant(@target_range.max, Operator::PUSH, 1)
-          expression.append_constant(@target_range.max_border,
-                                     Operator::PUSH, 1)
-          expression.append_operator(Operator::CALL, 5)
-          if @filter
-            expression.parse(@filter)
-            expression.append_operator(Operator::AND, 2)
-          end
-        end
-
         def use_range_index?(range_index)
-          return false unless ENV["GRN_LOGICAL_RANGE_FILTER_ENABLED"] == "yes"
+          current_limit = @context.current_limit
+          if current_limit < 0
+            return false
+          end
 
-          required_n_records = @context.current_offset + @context.current_limit
+          required_n_records = @context.current_offset + current_limit
           max_n_records = @table.size
           if max_n_records <= required_n_records
             return false
           end
 
           threshold = @context.threshold
-          if threshold <= 0
+          if threshold <= 0.0
+            return true
+          end
+          if threshold >= 1.0
             return false
           end
 
@@ -273,26 +247,26 @@ module Groonga
           when :all
             if @filter
               create_expression(@table) do |expression|
-                build_expression_all(expression)
-                estimated_n_records = expression.estimate_size
+                @expression_builder.build_all(expression)
+                estimated_n_records = expression.estimate_size(@table)
               end
             else
               estimated_n_records = max_n_records
             end
           when :partial_min
             create_expression(@table) do |expression|
-                build_expression_partial_min(expression)
-              estimated_n_records = expression.estimate_size
+              @expression_builder.build_partial_min(expression)
+              estimated_n_records = expression.estimate_size(@table)
             end
           when :partial_max
             create_expression(@table) do |expression|
-              build_expression_partial_max(expression)
-              estimated_n_records = expression.estimate_size
+              @expression_builder.build_partial_max(expression)
+              estimated_n_records = expression.estimate_size(@table)
             end
           when :partial_min_and_max
             create_expression(@table) do |expression|
-              build_expression_partial_min_and_max(expression)
-              estimated_n_records = expression.estimate_size
+              @expression_builder.build_partial_min_and_max(expression)
+              estimated_n_records = expression.estimate_size(@table)
             end
           end
 
@@ -324,7 +298,7 @@ module Groonga
                               nil, nil)
             else
               filter_table do |expression|
-                build_expression_all(expression)
+                @expression_builder.build_all(expression)
               end
             end
           end
@@ -355,8 +329,13 @@ module Groonga
                              :flags => flags) do |table_cursor|
               options = {
                 :offset => @context.current_offset,
-                :limit => @context.current_limit,
               }
+              current_limit = @context.current_limit
+              if current_limit < 0
+                options[:limit] = data_table.size
+              else
+                options[:limit] = current_limit
+              end
               if @filter
                 create_expression(data_table) do |expression|
                   expression.parse(@filter)
@@ -385,7 +364,9 @@ module Groonga
           if @context.current_offset > 0
             @context.current_offset = 0
           end
-          @context.current_limit -= result_set.size
+          if @context.current_limit > 0
+            @context.current_limit -= result_set.size
+          end
           @result_sets << result_set
         end
 
@@ -439,14 +420,21 @@ module Groonga
               :order => @context.order,
             },
           ]
+          if @context.current_limit > 0
+            limit = @context.current_limit
+          else
+            limit = result_set.size
+          end
           sorted_result_set = result_set.sort(sort_keys,
                                               :offset => @context.current_offset,
-                                              :limit => @context.current_limit)
+                                              :limit => limit)
           @result_sets << sorted_result_set
           if @context.current_offset > 0
             @context.current_offset = 0
           end
-          @context.current_limit -= sorted_result_set.size
+          if @context.current_limit > 0
+            @context.current_limit -= sorted_result_set.size
+          end
         end
       end
     end