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

data/lib/groonga/expression-builder.rb

@@ -93,7 +93,6 @@ module Groonga
         combined_builder.build(expression, variable)
       end
 
-      expression.compile
       expression
     end
 

data/rroonga-build.rb

@@ -20,15 +20,15 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 5
     MINOR = 0
-    MICRO = 8
+    MICRO = 9
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2015, 9, 29)
+    RELEASED_DATE = Time.utc(2015, 10, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 5
     MINOR = 0
-    MICRO = 8
+    MICRO = 9
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-conf.rb

@@ -0,0 +1,31 @@
+# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# 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
+
+class ConfTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
+
+  sub_test_case "#[]" do
+    test "existent" do
+      context.conf["rroonga.key"] = "value"
+      assert_equal("value", context.conf["rroonga.key"])
+    end
+
+    test "nonexistent" do
+      assert_nil(context.conf["nonexistent"])
+    end
+  end
+end

data/test/test-table.rb

@@ -421,6 +421,42 @@ class TableTest < Test::Unit::TestCase
                  sorted_bookmarks.collect(&:value))
   end
 
+  sub_test_case "#geo_sort" do
+    setup
+    def setup_schema
+      Groonga::Schema.define do |schema|
+        schema.create_table("Posts") do |table|
+          table.wgs84_geo_point("location")
+        end
+
+        schema.create_table("Locations",
+                            :type => :patricia_trie,
+                            :key_type => "WGS84GeoPoint") do |table|
+          table.index("Posts.location")
+        end
+      end
+
+      @posts = Groonga["Posts"]
+    end
+
+    setup
+    def setup_data
+      @posts.add(:location => "35.720253x139.762573")
+      @posts.add(:location => "35.730061x139.796234")
+      @posts.add(:location => "35.685341x139.783981")
+    end
+
+    test "default" do
+      results = @posts.geo_sort(@posts.column("location"), "35.7119x139.7983")
+      assert_equal([
+                     Groonga::WGS84GeoPoint.new("35.730061x139.796234"),
+                     Groonga::WGS84GeoPoint.new("35.685341x139.783981"),
+                     Groonga::WGS84GeoPoint.new("35.720253x139.762573"),
+                   ],
+                   results.collect(&:location))
+    end
+  end
+
   def test_union!
     bookmarks = Groonga::Hash.create(:name => "Bookmarks")
     bookmarks.define_column("title", "ShortText")

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/include/groonga/groonga/conf.h

@@ -0,0 +1,42 @@
+/* -*- 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 version 2.1 as published by the Free Software Foundation.
+
+  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 GRN_CONF_H
+#define GRN_CONF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define GRN_CONF_MAX_KEY_SIZE GRN_TABLE_MAX_KEY_SIZE
+#define GRN_CONF_MAX_VALUE_SIZE                                         \
+  (GRN_CONF_VALUE_SPACE_SIZE - sizeof(uint32_t) - 1) /* 1 is for '\0' */
+#define GRN_CONF_VALUE_SPACE_SIZE (4 * 1024)
+
+GRN_API grn_rc grn_conf_set(grn_ctx *ctx,
+                            const char *key, int key_size,
+                            const char *value, int value_size);
+GRN_API grn_rc grn_conf_get(grn_ctx *ctx,
+                            const char *key, int key_size,
+                            const char **value, uint32_t *value_size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GRN_CONF_H */

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

@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2009-2014 Brazil
+  Copyright(C) 2009-2015 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -55,6 +55,7 @@ GRN_API grn_rc grn_expr_syntax_escape_query(grn_ctx *ctx,
                                             grn_obj *escaped_query);
 
 GRN_API grn_rc grn_expr_compile(grn_ctx *ctx, grn_obj *expr);
+GRN_API grn_obj *grn_expr_rewrite(grn_ctx *ctx, grn_obj *expr);
 GRN_API grn_rc grn_expr_dump_plan(grn_ctx *ctx, grn_obj *expr, grn_obj *buffer);
 GRN_API grn_obj *grn_expr_exec(grn_ctx *ctx, grn_obj *expr, int nargs);
 

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/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