rroonga 5.0.8-x86-mingw32 → 5.0.9-x86-mingw32

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

@@ -1,3 +1,6 @@
+require "expression_rewriter"
+require "expression_rewriters"
+
 require "scan_info"
 require "scan_info_builder"
 
@@ -5,12 +8,37 @@ require "expression_size_estimator"
 
 module Groonga
   class Expression
-    def build_scan_info(op, size)
+    def rewrite
+      rewritten = nil
+      begin
+        source = self
+        ExpressionRewriters.classes.each do |rewriter_class|
+          rewriter = rewriter_class.new(source)
+          new_rewritten = rewriter.rewrite
+          if new_rewritten
+            rewritten.close if rewritten
+            rewritten = new_rewritten
+            source = rewritten
+          end
+        end
+      rescue GroongaError => groonga_error
+        context.set_groonga_error(groonga_error)
+        rewritten.close if rewritten
+        rewritten = nil
+      rescue => error
+        context.record_error(:invalid_argument, error)
+        rewritten.close if rewritten
+        rewritten = nil
+      end
+      rewritten
+    end
+
+    def build_scan_info(op, record_exist)
       begin
-        builder = ScanInfoBuilder.new(self, op, size)
+        builder = ScanInfoBuilder.new(self, op, record_exist)
         builder.build
       rescue => error
-        Context.instance.record_error(:invalid_argument, error)
+        context.record_error(:invalid_argument, error)
         nil
       end
     end

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

@@ -0,0 +1,22 @@
+module Groonga
+  class ExpressionRewriter
+    class << self
+      def register(name)
+        ExpressionRewriters.register(name, self)
+      end
+    end
+
+    def initialize(expression)
+      @expression = expression
+    end
+
+    def rewrite
+      nil
+    end
+
+    private
+    def context
+      @context ||= Context.instance
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module Groonga
+  module ExpressionRewriters
+    @@rewriters = {}
+
+    class << self
+      def register(name, rewriter_class)
+        @@rewriters[name] = rewriter_class
+      end
+
+      def classes
+        rewriters_table_name =
+          Conf["expression_rewriter.table"] || "expression_rewriters"
+        rewriters_table = Context.instance[rewriters_table_name]
+        return [] if rewriters_table.nil?
+
+        rewriters_table.collect do |id|
+          record = Record.new(rewriters_table, id)
+          name = record.key
+          rewriter = @@rewriters[name]
+          if rewriter.nil?
+            plugin_name = record.plugin_name.value
+            require plugin_name
+            rewriter = @@rewriters[name]
+            raise "unknown rewriter: <#{name}>:<#{plugin_name}>" if rewriter.nil?
+          end
+          rewriter
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Groonga
     end
 
     def estimate
-      builder = ScanInfoBuilder.new(@expression, Operator::OR, 0)
+      builder = ScanInfoBuilder.new(@expression, Operator::OR, false)
       data_list = builder.build
       return @table_size if data_list.nil?
 

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

@@ -8,5 +8,31 @@ module Groonga
         "@id=#{@id.inspect}, @table=#{@table.inspect}>"
       end
     end
+
+    def [](name)
+      column = find_column(name)
+      if column.nil?
+        raise InvalidArgument, "unknown column: <#{absolute_column_name(name)}>"
+      end
+      column[@id]
+    end
+
+    def method_missing(name, *args, &block)
+      return super unless args.empty?
+
+      column = find_column(name)
+      return super if column.nil?
+
+      column[@id]
+    end
+
+    private
+    def absolute_column_name(name)
+      "#{@table.name}.#{name}"
+    end
+
+    def find_column(name)
+      Context.instance[absolute_column_name(name)]
+    end
   end
 end

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

@@ -8,7 +8,7 @@ class ScriptLoader
   end
 
   def load_once
-    if absolete_path?(@base_path)
+    if absolute_path?(@base_path)
       loaded = load_once_path(@base_path)
       if loaded.nil?
         raise LoadError, error_message
@@ -17,7 +17,7 @@ class ScriptLoader
       end
     else
       $LOAD_PATH.each do |load_path|
-        unless absolete_path?(load_path)
+        unless absolute_path?(load_path)
           load_path = File.expand_path(load_path)
         end
         loaded = load_once_path(File.join(load_path, @base_path))
@@ -32,20 +32,20 @@ class ScriptLoader
     "cannot load such file -- #{@base_path}"
   end
 
-  def absolete_path?(path)
+  def absolute_path?(path)
     path.start_with?("/")
   end
 
   def load_once_path(path)
-    loaded = load_once_absolete_path(path)
+    loaded = load_once_absolute_path(path)
     return loaded unless loaded.nil?
 
     return nil unless File.extname(path).empty?
 
-    load_once_absolete_path("#{path}.rb")
+    load_once_absolute_path("#{path}.rb")
   end
 
-  def load_once_absolete_path(path)
+  def load_once_absolute_path(path)
     return false if $".include?(path)
     return false if @@loading_paths.key?(path)
 

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

@@ -10,11 +10,11 @@ module Groonga
       CONST = 4
     end
 
-    def initialize(expression, operator, size)
+    def initialize(expression, operator, record_exist)
       @data_list = []
       @expression = expression
       @operator = operator
-      @size = size
+      @record_exist = record_exist
     end
 
     RELATION_OPERATORS = [
@@ -61,7 +61,7 @@ module Groonga
       return nil unless valid?
 
       status = Status::START
-      variable = @expression.get_var_by_offset(0)
+      variable = @expression[0]
       data = nil
       codes = @expression.codes
       n_codes = codes.size
@@ -120,7 +120,7 @@ module Groonga
         end
       end
 
-      if @operator == Operator::OR and @size == 0
+      if @operator == Operator::OR and !@record_exist
         first_data = @data_list.first
         if (first_data.flags & ScanInfo::Flags::PUSH) == 0 or
             first_data.logical_op != @operator
@@ -141,7 +141,7 @@ module Groonga
       n_relation_expressions = 0
       n_logical_expressions = 0
       status = Status::START
-      variable = @expression.get_var_by_offset(0)
+      variable = @expression[0]
       codes = @expression.codes
       codes.each do |code|
         case code.op

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.8
+groonga_version=5.0.9
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 5.0.8
+Version: 5.0.9
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga

data/vendor/local/share/doc/groonga/en/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 63a7641c9b430e9dab7bee63dbd9b51e
+config: 880b0402979c4872335a600402a3fc27
 tags: 645f666f9bcd5a90fca523b33c5a78b7

data/vendor/local/share/doc/groonga/en/html/_sources/install/centos.txt

@@ -170,9 +170,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-5.0.8.tar.gz
-  % tar xvzf groonga-5.0.8.tar.gz
-  % cd groonga-5.0.8
+  % wget http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
+  % tar xvzf groonga-5.0.9.tar.gz
+  % cd groonga-5.0.9
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

data/vendor/local/share/doc/groonga/en/html/_sources/install/debian.txt

@@ -123,9 +123,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-5.0.8.tar.gz
-  % tar xvzf groonga-5.0.8.tar.gz
-  % cd groonga-5.0.8
+  % wget http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
+  % tar xvzf groonga-5.0.9.tar.gz
+  % cd groonga-5.0.9
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

data/vendor/local/share/doc/groonga/en/html/_sources/install/fedora.txt

@@ -80,9 +80,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-5.0.8.tar.gz
-  % tar xvzf groonga-5.0.8.tar.gz
-  % cd groonga-5.0.8
+  % wget http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
+  % tar xvzf groonga-5.0.9.tar.gz
+  % cd groonga-5.0.9
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

data/vendor/local/share/doc/groonga/en/html/_sources/install/mac_os_x.txt

@@ -39,9 +39,9 @@ Install `Xcode <https://developer.apple.com/xcode/>`_.
 
 Download source::
 
-  % curl -O http://packages.groonga.org/source/groonga/groonga-5.0.8.tar.gz
-  % tar xvzf groonga-5.0.8.tar.gz
-  % cd groonga-5.0.8
+  % curl -O http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
+  % tar xvzf groonga-5.0.9.tar.gz
+  % cd groonga-5.0.9
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

data/vendor/local/share/doc/groonga/en/html/_sources/install/others.txt

@@ -74,9 +74,9 @@ Build from source
 Groonga uses GNU build system. So the following is the simplest build
 steps::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-5.0.8.tar.gz
-  % tar xvzf groonga-5.0.8.tar.gz
-  % cd groonga-5.0.8
+  % wget http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
+  % tar xvzf groonga-5.0.9.tar.gz
+  % cd groonga-5.0.9
   % ./configure
   % make
   % sudo make install

data/vendor/local/share/doc/groonga/en/html/_sources/install/solaris.txt

@@ -17,9 +17,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-5.0.8.tar.gz
-  % gtar xvzf groonga-5.0.8.tar.gz
-  % cd groonga-5.0.8
+  % wget http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
+  % gtar xvzf groonga-5.0.9.tar.gz
+  % cd groonga-5.0.9
 
 Configure with ``CFLAGS="-m64" CXXFLAGS="-m64"`` variables. They are
 needed for building 64-bit version. To build 32-bit version, just

data/vendor/local/share/doc/groonga/en/html/_sources/install/ubuntu.txt

@@ -81,9 +81,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-5.0.8.tar.gz
-  % tar xvzf groonga-5.0.8.tar.gz
-  % cd groonga-5.0.8
+  % wget http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
+  % tar xvzf groonga-5.0.9.tar.gz
+  % cd groonga-5.0.9
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

data/vendor/local/share/doc/groonga/en/html/_sources/install/windows.txt

@@ -21,14 +21,14 @@ Installer
 For 32-bit environment, download x86 executable binary from
 packages.groonga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-5.0.8-x86.exe
+  * http://packages.groonga.org/windows/groonga/groonga-5.0.9-x86.exe
 
 Then run it.
 
 For 64-bit environment, download x64 executable binary from
 packages.goronga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-5.0.8-x64.exe
+  * http://packages.groonga.org/windows/groonga/groonga-5.0.9-x64.exe
 
 Then run it.
 
@@ -41,14 +41,14 @@ zip
 For 32-bit environment, download x86 zip archive from
 packages.groonga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-5.0.8-x86.zip
+  * http://packages.groonga.org/windows/groonga/groonga-5.0.9-x86.zip
 
 Then extract it.
 
 For 64-bit environment, download x64 zip archive from
 packages.groonga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-5.0.8-x64.zip
+  * http://packages.groonga.org/windows/groonga/groonga-5.0.9-x64.zip
 
 Then extract it.
 
@@ -66,27 +66,27 @@ Windows. Here are required tools:
 
 Download zipped source from packages.groonga.org:
 
-  * http://packages.groonga.org/source/groonga/groonga-5.0.8.zip
+  * http://packages.groonga.org/source/groonga/groonga-5.0.9.zip
 
 Then extract it.
 
 Move to the Groonga's source folder::
 
-  > cd c:\Users\%USERNAME%\Downloads\groonga-5.0.8
+  > cd c:\Users\%USERNAME%\Downloads\groonga-5.0.9
 
 Configure by ``cmake``. The following commnad line is for 64-bit
 version. To build 32-bit version, use ``-G "Visual Studio 12 2013"``
 parameter instead::
 
-  groonga-5.0.8> cmake . -G "Visual Studio 12 2013 Win64" -DCMAKE_INSTALL_PREFIX=C:\Groonga
+  groonga-5.0.9> cmake . -G "Visual Studio 12 2013 Win64" -DCMAKE_INSTALL_PREFIX=C:\Groonga
 
 Build::
 
-  groonga-5.0.8> cmake --build . --config Release
+  groonga-5.0.9> cmake --build . --config Release
 
 Install::
 
-  groonga-5.0.8> cmake --build . --config Release --target Install
+  groonga-5.0.9> cmake --build . --config Release --target Install
 
 After the above steps, :doc:`/reference/executables/groonga` is found at
 ``c:\Groonga\bin\groonga.exe``.