rroonga 5.0.8-x64-mingw32 → 5.0.9-x64-mingw32

data/vendor/local/include/groonga/groonga/geo.h

@@ -0,0 +1,39 @@
+/* -*- c-basic-offset: 2 -*- */
+/*
+  Copyright(C) 2015 Brazil
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef GROONGA_GEO_H
+#define GROONGA_GEO_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+GRN_API int grn_geo_table_sort(grn_ctx *ctx,
+                               grn_obj *table,
+                               int offset,
+                               int limit,
+                               grn_obj *result,
+                               grn_obj *column,
+                               grn_obj *geo_point);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GROONGA_GEO_H */

data/vendor/local/include/groonga/groonga/groonga.h

@@ -441,6 +441,13 @@ GRN_API grn_rc grn_ctx_use(grn_ctx *ctx, grn_obj *db);
 GRN_API grn_obj *grn_ctx_db(grn_ctx *ctx);
 GRN_API grn_obj *grn_ctx_get(grn_ctx *ctx, const char *name, int name_size);
 GRN_API grn_rc grn_ctx_get_all_tables(grn_ctx *ctx, grn_obj *tables_buffer);
+GRN_API grn_rc grn_ctx_get_all_types(grn_ctx *ctx, grn_obj *types_buffer);
+GRN_API grn_rc grn_ctx_get_all_tokenizers(grn_ctx *ctx,
+                                          grn_obj *tokenizers_buffer);
+GRN_API grn_rc grn_ctx_get_all_normalizers(grn_ctx *ctx,
+                                           grn_obj *normalizers_buffer);
+GRN_API grn_rc grn_ctx_get_all_token_filters(grn_ctx *ctx,
+                                             grn_obj *token_filters_buffer);
 
 typedef enum {
   GRN_DB_VOID = 0,

data/vendor/local/include/groonga/groonga/obj.h

@@ -23,12 +23,62 @@
 extern "C" {
 #endif
 
+#define GRN_OBJ_IS_TRUE(ctx, obj, result) do {  \
+  grn_obj *obj_ = (obj);                        \
+  if (obj_) {                                   \
+    switch (obj_->header.type) {                \
+    case GRN_BULK :                             \
+      switch (obj_->header.domain) {            \
+      case GRN_DB_BOOL :                        \
+        result = GRN_BOOL_VALUE(obj_);          \
+        break;                                  \
+      case GRN_DB_INT32 :                       \
+        result = GRN_INT32_VALUE(obj_) != 0;    \
+        break;                                  \
+      case GRN_DB_UINT32 :                      \
+        result = GRN_UINT32_VALUE(obj_) != 0;   \
+        break;                                  \
+      case GRN_DB_FLOAT :                       \
+      {                                         \
+        double float_value;                     \
+        float_value = GRN_FLOAT_VALUE(obj_);    \
+        result = (float_value < -DBL_EPSILON || \
+                  DBL_EPSILON < float_value);   \
+      }                                         \
+      break;                                    \
+      case GRN_DB_SHORT_TEXT :                  \
+      case GRN_DB_TEXT :                        \
+      case GRN_DB_LONG_TEXT :                   \
+        result = GRN_TEXT_LEN(obj_) != 0;       \
+        break;                                  \
+      default :                                 \
+        result = GRN_FALSE;                     \
+        break;                                  \
+      }                                         \
+      break;                                    \
+    case GRN_VECTOR :                           \
+      result = GRN_TRUE;                        \
+      break;                                    \
+    default :                                   \
+      result = GRN_FALSE;                       \
+      break;                                    \
+    }                                           \
+  } else {                                      \
+    result = GRN_FALSE;                         \
+  }                                             \
+} while (0)
+
+
 GRN_API grn_bool grn_obj_is_builtin(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_table(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_type(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_proc(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_tokenizer_proc(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_function_proc(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_selector_proc(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_selector_only_proc(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_normalizer_proc(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_token_filter_proc(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_scorer_proc(grn_ctx *ctx, grn_obj *obj);
 
 GRN_API grn_rc grn_obj_cast(grn_ctx *ctx,

data/vendor/local/include/groonga/groonga/output.h

@@ -76,8 +76,10 @@ GRN_API void grn_ctx_output_array_close(grn_ctx *ctx);
 GRN_API void grn_ctx_output_map_open(grn_ctx *ctx,
                                      const char *name, int nelements);
 GRN_API void grn_ctx_output_map_close(grn_ctx *ctx);
+GRN_API void grn_ctx_output_null(grn_ctx *ctx);
 GRN_API void grn_ctx_output_int32(grn_ctx *ctx, int value);
-GRN_API void grn_ctx_output_int64(grn_ctx *ctx, long long int value);
+GRN_API void grn_ctx_output_int64(grn_ctx *ctx, int64_t value);
+GRN_API void grn_ctx_output_uint64(grn_ctx *ctx, uint64_t value);
 GRN_API void grn_ctx_output_float(grn_ctx *ctx, double value);
 GRN_API void grn_ctx_output_cstr(grn_ctx *ctx, const char *value);
 GRN_API void grn_ctx_output_str(grn_ctx *ctx,

data/vendor/local/include/groonga/groonga/plugin.h

@@ -146,7 +146,9 @@ GRN_API grn_obj *grn_plugin_proc_get_var_by_offset(grn_ctx *ctx,
                                                    grn_user_data *user_data,
                                                    unsigned int offset);
 
+/* Deprecated since 5.0.9. Use grn_plugin_windows_base_dir() instead. */
 GRN_API const char *grn_plugin_win32_base_dir(void);
+GRN_API const char *grn_plugin_windows_base_dir(void);
 
 GRN_API int grn_plugin_charlen(grn_ctx *ctx, const char *str_ptr,
                                unsigned int str_length, grn_encoding encoding);

data/vendor/local/include/groonga/groonga/windows.h

@@ -0,0 +1,34 @@
+/*
+  Copyright(C) 2015 Brazil
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef GROONGA_WINDOWS_H
+#define GROONGA_WINDOWS_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifdef WIN32
+GRN_API const char *grn_windows_base_dir(void);
+#endif /* WIN32 */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GROONGA_WINDOWS_H */

data/vendor/local/include/groonga/groonga.h

@@ -20,13 +20,16 @@
 
 #include "groonga/portability.h"
 #include "groonga/groonga.h"
+#include "groonga/conf.h"
 #include "groonga/obj.h"
 #include "groonga/ii.h"
+#include "groonga/geo.h"
 #include "groonga/expr.h"
 #include "groonga/output.h"
 #include "groonga/util.h"
 #include "groonga/request_canceler.h"
 #include "groonga/thread.h"
+#include "groonga/windows.h"
 #include "groonga/windows_event_logger.h"
 
 #endif /* GROONGA_H */

data/vendor/local/lib/groonga/plugins/expression_rewriters/optimizer.rb

@@ -0,0 +1,38 @@
+module Groonga
+  module ExpressionRewriters
+    class Optimizer < ExpressionRewriter
+      register "optimizer"
+
+      def rewrite
+        codes = @expression.codes
+        n_codes = codes.size
+
+        # (A >= x && A < y) -> between(A, x, "include", y, "exclude")
+        return nil if n_codes != 7
+
+        return nil if codes[6].op != Operator::AND
+
+        return nil if codes[0].op != Operator::GET_VALUE
+        return nil if codes[1].op != Operator::PUSH
+        return nil if codes[2].op != Operator::GREATER_EQUAL
+
+        return nil if codes[3].op != Operator::GET_VALUE
+        return nil if codes[4].op != Operator::PUSH
+        return nil if codes[5].op != Operator::LESS
+
+        return nil if codes[3].value != codes[0].value
+
+        variable = @expression[0]
+        rewritten = Expression.create(context[variable.domain])
+        rewritten.append_object(Context.instance["between"], Operator::PUSH, 1)
+        rewritten.append_object(codes[0].value, Operator::GET_VALUE, 1)
+        rewritten.append_constant(codes[1].value.value, Operator::PUSH, 1)
+        rewritten.append_constant("include", Operator::PUSH, 1)
+        rewritten.append_constant(codes[4].value.value, Operator::PUSH, 1)
+        rewritten.append_constant("exclude", Operator::PUSH, 1)
+        rewritten.append_operator(Operator::CALL, 5)
+        rewritten
+      end
+    end
+  end
+end

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)::