rroonga 7.1.1-x86-mingw32 → 9.0.2-x86-mingw32

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

@@ -32,7 +32,7 @@ module Groonga
     end
 
     def find_column(name)
-      Context.instance[absolute_column_name(name)]
+      @table.find_column(name)
     end
   end
 end

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

@@ -78,7 +78,6 @@ module Groonga
           if context.status == :const
             data = context.data
             data.op = Operator::PUSH
-            data.end = data.start
             @data_list << data
             context.data = nil
           end
@@ -100,7 +99,6 @@ module Groonga
           if code.modify > 0 and
               LOGICAL_OPERATORS.include?(codes[i + code.modify].op)
             data.op = Operator::PUSH
-            data.end = data.start
             @data_list << data
             context.data = nil
             context.status = :start
@@ -482,7 +480,6 @@ module Groonga
 
     def create_all_match_data
       data = ScanInfoData.new(0)
-      data.end = 0
       data.flags = ScanInfo::Flags::PUSH
       data.op = Operator::CALL
       data.logical_op = Operator::OR

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

@@ -17,7 +17,7 @@ module Groonga
     attr_accessor :weight
     def initialize(start)
       @start = start
-      @end = 0
+      @end = start
       @op = Operator::NOP
       @logical_op = Operator::OR
       @query = nil
@@ -88,12 +88,14 @@ module Groonga
         match_resolve_index_expression(arg)
       when Accessor
         match_resolve_index_accessor(arg)
+      when IndexColumn
+        match_resolve_index_index_column(arg)
       when Indexable
         match_resolve_index_indexable(arg)
       else
         message =
           "The first argument of SIMILAR must be Expression, Accessor or Indexable: #{arg.class}"
-        raise ErrorMesesage, message
+        raise ErrorMessage, message
       end
 
       self.query = @args[1]
@@ -148,6 +150,8 @@ module Groonga
     def index_searchable_regexp?(pattern)
       return false if pattern.nil?
 
+      paren = :outside
+      dot = false
       previous_char = nil
       pattern.value.each_char do |char|
         if previous_char == "\\"
@@ -167,13 +171,50 @@ module Groonga
             next
           end
         else
-          case char
-          when ".", "[", "]", "|", "?", "+", "*", "{", "}", "^", "$", "(", ")"
-            return false
+          case paren
+          when :starting
+            case char
+            when "?"
+              return false if previous_char != "("
+            when "-"
+              return false if previous_char != "?"
+            when "m"
+              return false if previous_char != "-"
+            when "i"
+              return false if previous_char != "m"
+            when "x"
+              return false if previous_char != "i"
+            when ":"
+              return false if previous_char != "x"
+              paren = :inside
+            else
+              return false
+            end
+          else
+            case char
+            when "("
+              return false unless paren == :outside
+              paren = :starting
+            when ")"
+              return false unless paren == :inside
+              paren = :outside
+            when "."
+              return false if dot
+              dot = true
+            when "*"
+              return false unless dot
+              dot = false
+            when "[", "]", "|", "?", "+", "{", "}", "^", "$"
+              return false
+            else
+              return false if dot
+            end
           end
         end
         previous_char = char
       end
+      return false if dot
+      return false unless paren == :outside
       true
     end
 

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

@@ -15,22 +15,13 @@ module Groonga
 
       size = nil
       case @data.op
-      when Operator::MATCH,
-           Operator::FUZZY
-        size = estimate_match(index_column)
-      when Operator::REGEXP
-        size = estimate_regexp(index_column)
-      when Operator::EQUAL
-        size = estimate_equal(index_column)
-      when Operator::LESS,
-           Operator::LESS_EQUAL,
-           Operator::GREATER,
-           Operator::GREATER_EQUAL
-        size = estimate_range(index_column)
-      when Operator::PREFIX
-        size = estimate_prefix(index_column)
       when Operator::CALL
         size = estimate_call(index_column)
+      else
+        left = ExpressionTree::Variable.new(index_column)
+        right = ExpressionTree::Constant.new(@data.query)
+        node = ExpressionTree::BinaryOperation.new(@data.op, left, right)
+        size = node.estimate_size(@table)
       end
       size || @table_size
     end
@@ -47,128 +38,6 @@ module Groonga
       index_column
     end
 
-    def sampling_cursor_limit(n_terms)
-      limit = n_terms * 0.01
-      if limit < 10
-        10
-      elsif limit > 1000
-        1000
-      else
-        limit.to_i
-      end
-    end
-
-    def estimate_match(index_column)
-      index_column.estimate_size(:query => @data.query.value)
-    end
-
-    def estimate_regexp(index_column)
-      index_column.estimate_size(:query => @data.query.value,
-                                 :mode => @data.op)
-    end
-
-    def estimate_equal(index_column)
-      query = @data.query
-      if index_column.is_a?(Accessor)
-        table = index_column.object
-        if index_column.name == "_id"
-          if table.id?(query.value)
-            1
-          else
-            0
-          end
-        else
-          if table[query.value]
-            1
-          else
-            0
-          end
-        end
-      else
-        lexicon = index_column.lexicon
-        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)
-      end
-    end
-
-    def estimate_range(index_column)
-      if index_column.is_a?(Table)
-        is_table_search = true
-        lexicon = index_column
-      elsif index_column.is_a?(Groonga::Accessor)
-        is_table_search = true
-        lexicon = index_column.object
-      else
-        is_table_search = false
-        lexicon = index_column.lexicon
-      end
-      n_terms = lexicon.size
-      return 0 if n_terms.zero?
-
-      value = @data.query.value
-      options = {
-        :limit => sampling_cursor_limit(n_terms),
-      }
-      case @data.op
-      when Operator::LESS
-        options[:max] = value
-        options[:flags] = TableCursorFlags::LT
-      when Operator::LESS_EQUAL
-        options[:max] = value
-        options[:flags] = TableCursorFlags::LE
-      when Operator::GREATER
-        options[:min] = value
-        options[:flags] = TableCursorFlags::GT
-      when Operator::GREATER_EQUAL
-        options[:min] = value
-        options[:flags] = TableCursorFlags::GE
-      end
-      TableCursor.open(lexicon, options) do |cursor|
-        if is_table_search
-          size = 1
-        else
-          size = index_column.estimate_size(:lexicon_cursor => cursor)
-        end
-        size += 1 if cursor.next != ID::NIL
-        size
-      end
-    end
-
-    def estimate_prefix(index_column)
-      is_table_search =
-        (index_column.is_a?(Accessor) and
-        index_column.name == "_key")
-      if is_table_search
-        lexicon = index_column.object
-      else
-        lexicon = index_column.lexicon
-      end
-      n_terms = lexicon.size
-      return 0 if n_terms.zero?
-
-      value = @data.query.value
-      options = {
-        :min => value,
-        :limit => sampling_cursor_limit(n_terms),
-        :flags => TableCursorFlags::PREFIX,
-      }
-      TableCursor.open(lexicon, options) do |cursor|
-        if is_table_search
-          size = 1
-        else
-          size = index_column.estimate_size(:lexicon_cursor => cursor)
-        end
-        size += 1 if cursor.next != ID::NIL
-        size
-      end
-    end
-
     def estimate_call(index_column)
       procedure = @data.args[0]
       arguments = @data.args[1..-1].collect do |arg|

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

@@ -28,9 +28,9 @@ module Groonga
         sorted = Array.create("", self)
         begin
           sort_raw(sort_keys, offset, limit, sorted)
-        rescue Exception
+        rescue Exception => error
           sorted.close
-          raise
+          raise error
         end
         sorted
       end

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/build/dist-x86/lib -lmsgpackc /build/dist-x86/lib/libonigmo.la -llz4 -lz -lws2_32 -ldbghelp'
+dependency_libs=' -L/build/dist-x86/lib -lmsgpackc /build/dist-x86/lib/libonigmo.la -llz4 -lws2_32 -ldbghelp -lpsapi -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/libpcre.la

@@ -1,5 +1,5 @@
 # libpcre.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6
+# Generated by libtool (GNU libtool) 2.4.6.40-6ca5-dirty
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libpcre.
 current=3
 age=2
-revision=9
+revision=10
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libpcrecpp.la

@@ -1,5 +1,5 @@
 # libpcrecpp.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6
+# Generated by libtool (GNU libtool) 2.4.6.40-6ca5-dirty
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

data/vendor/local/lib/libpcreposix.la

@@ -1,5 +1,5 @@
 # libpcreposix.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6
+# Generated by libtool (GNU libtool) 2.4.6.40-6ca5-dirty
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libpcreposix.
 current=0
 age=0
-revision=5
+revision=6
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/pkgconfig/groonga-normalizer-mysql.pc

@@ -2,4 +2,4 @@ plugin_name=normalizers/mysql
 
 Name: groonga-normalizer-mysql
 Description: A MySQL compatible normalizer plugin for groonga
-Version: 1.1.1
+Version: 1.1.3

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=7.1.0-74-g995a938
+groonga_version=9.0.2
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 7.1.1
+Version: 9.0.2
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga

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

@@ -7,8 +7,8 @@ libdir=/build/dist-x86/lib
 includedir=/build/dist-x86/include
 
 Name: lz4
-Description: fast lossless compression algorithm library
-URL: http://code.google.com/p/lz4/
-Version: 126
+Description: extremely fast lossless compression algorithm library
+URL: http://www.lz4.org/
+Version: 1.8.2
 Libs: -L/build/dist-x86/lib -llz4
 Cflags: -I/build/dist-x86/include

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

@@ -7,7 +7,7 @@ includedir=${prefix}/include
 
 Name: libpcre
 Description: PCRE - Perl compatible regular expressions C library with 8 bit character support
-Version: 8.41
+Version: 8.42
 Libs: -L${libdir} -lpcre
 Libs.private:  
 Cflags: -I${includedir} 

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

@@ -7,6 +7,6 @@ includedir=${prefix}/include
 
 Name: libpcrecpp
 Description: PCRECPP - C++ wrapper for PCRE
-Version: 8.41
+Version: 8.42
 Libs: -L${libdir} -lpcre -lpcrecpp
 Cflags: -I${includedir} 

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

@@ -7,7 +7,7 @@ includedir=${prefix}/include
 
 Name: libpcreposix
 Description: PCREPosix - Posix compatible interface to libpcre
-Version: 8.41
+Version: 8.42
 Libs: -L${libdir} -lpcreposix
 Cflags: -I${includedir} 
 Requires.private: libpcre