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

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

@@ -0,0 +1,65 @@
+module Groonga
+  module Sharding
+    class RangeExpressionBuilder
+      def initialize(key, target_range, filter)
+        @key = key
+        @target_range = target_range
+        @filter = filter
+      end
+
+      def build_all(expression)
+        return if @filter.nil?
+
+        expression.parse(@filter)
+      end
+
+      def build_partial_min(expression)
+        expression.append_object(@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_partial_max(expression)
+        expression.append_object(@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_partial_min_and_max(expression)
+        between = Groonga::Context.instance["between"]
+        expression.append_object(between, Operator::PUSH, 1)
+        expression.append_object(@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
+    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/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/suggest'
+libdir='/home/kenhys/work/groonga/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/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/table'
+libdir='/home/kenhys/work/groonga/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/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/token_filters'
+libdir='/home/kenhys/work/groonga/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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmecab.la -lpthread /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/tokenizers'
+libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/tokenizers'

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

@@ -50,45 +50,54 @@ module Groonga
 
     def estimate_data(data)
       search_index = data.search_indexes.first
+      return @table_size if search_index.nil?
+
+      index_column = resolve_index_column(search_index.index_column,
+                                          data.op)
+      return @table_size if index_column.nil?
+
       size = nil
-      if search_index
-        case data.op
-        when Operator::MATCH
-          size = estimate_match(data, search_index)
-        when Operator::EQUAL
-          size = estimate_equal(data, search_index)
-        when Operator::LESS,
-             Operator::LESS_EQUAL,
-             Operator::GREATER,
-             Operator::GREATER_EQUAL
-          size = estimate_range(data, search_index)
-        when Operator::CALL
-          procedure = data.args.first
-          if procedure.is_a?(Procedure) and procedure.name == "between"
-            size = estimate_between(data, search_index)
-          end
+      case data.op
+      when Operator::MATCH
+        size = estimate_match(data, index_column)
+      when Operator::REGEXP
+        size = estimate_regexp(data, index_column)
+      when Operator::EQUAL
+        size = estimate_equal(data, index_column)
+      when Operator::LESS,
+           Operator::LESS_EQUAL,
+           Operator::GREATER,
+           Operator::GREATER_EQUAL
+        size = estimate_range(data, index_column)
+      when Operator::CALL
+        procedure = data.args.first
+        if procedure.is_a?(Procedure) and procedure.name == "between"
+          size = estimate_between(data, index_column)
         end
       end
       size || @table_size
     end
 
-    def estimate_match(data, search_index)
-      index_column = search_index.index_column
-      if index_column.is_a?(Accessor)
-        # TODO
-        return nil
+    def resolve_index_column(index_column, operator)
+      while index_column.is_a?(Accessor)
+        index_info = index_column.find_index(operator)
+        return nil if index_info.nil?
+        index_column = index_info.index
       end
 
+      index_column
+    end
+
+    def estimate_match(data, index_column)
       index_column.estimate_size(:query => data.query.value)
     end
 
-    def estimate_equal(data, search_index)
-      index_column = search_index.index_column
-      if index_column.is_a?(Accessor)
-        # TODO
-        return nil
-      end
+    def estimate_regexp(data, index_column)
+      index_column.estimate_size(:query => data.query.value,
+                                 :mode => data.op)
+    end
 
+    def estimate_equal(data, index_column)
       lexicon = index_column.lexicon
       term_id = lexicon[data.query]
       return 0 if term_id.nil?
@@ -96,13 +105,7 @@ module Groonga
       index_column.estimate_size(:term_id => term_id)
     end
 
-    def estimate_range(data, search_index)
-      index_column = search_index.index_column
-      if index_column.is_a?(Accessor)
-        # TODO
-        return nil
-      end
-
+    def estimate_range(data, index_column)
       lexicon = index_column.lexicon
       value = data.query.value
       options = {}
@@ -125,13 +128,7 @@ module Groonga
       end
     end
 
-    def estimate_between(data, search_index)
-      index_column = search_index.index_column
-      if index_column.is_a?(Accessor)
-        # TODO
-        return nil
-      end
-
+    def estimate_between(data, index_column)
       lexicon = index_column.lexicon
       _, _, min, min_border, max, max_border = data.args
       options = {

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

@@ -124,6 +124,9 @@ module Groonga
             return false
           when "k", "g", "1", "2", "3", "4", "5", "6", "7", "8", "9"
             return false
+          when "\\"
+            previous_char = nil
+            next
           end
         else
           case char

data/vendor/local/lib/libgroonga.la

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

data/vendor/local/lib/libmecab.la

@@ -17,7 +17,7 @@ old_library='libmecab.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib -lpthread'
+dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib -lpthread'
 
 # 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'
+libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib'

data/vendor/local/lib/libmsgpack.la

@@ -5,7 +5,7 @@
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
-dlname='../bin/libmsgpack-3.dll'
+dlname='../bin/libmsgpack-4.dll'
 
 # Names of this library.
 library_names='libmsgpack.dll.a'
@@ -17,13 +17,13 @@ old_library='libmsgpack.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib'
+dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
 
 # Version information for libmsgpack.
-current=3
+current=4
 age=0
 revision=0
 
@@ -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'
+libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib'

data/vendor/local/lib/libmsgpackc.la

@@ -17,7 +17,7 @@ old_library='libmsgpackc.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib'
+dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib'
 
 # 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'
+libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib'

data/vendor/local/lib/libonig.la

@@ -17,7 +17,7 @@ old_library='libonig.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib'
+dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib'
 
 # 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'
+libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib'

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

@@ -1,4 +1,4 @@
-prefix=/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64
+prefix=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64
 exec_prefix=${prefix}
 bindir=${exec_prefix}/bin
 sbindir=${exec_prefix}/sbin
@@ -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.2
+groonga_version=5.0.3
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 5.0.2
+Version: 5.0.3
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga

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

@@ -2,13 +2,13 @@
 #   Copyright (C) 2011-2014, Yann Collet.
 #   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
 
-prefix=/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64
-libdir=/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib
-includedir=/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/include
+prefix=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64
+libdir=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib
+includedir=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/include
 
 Name: lz4
 Description: fast lossless compression algorithm library
 URL: http://code.google.com/p/lz4/
 Version: 126
-Libs: -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib -llz4
-Cflags: -I/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/include
+Libs: -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib -llz4
+Cflags: -I/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/include