rroonga 5.0.8 → 5.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 127d2cdb98d5b76f7b15abcf73df3490bd3ab152
-  data.tar.gz: c38949db7ca8a98925bc4ac5694010b61c580928
+  metadata.gz: dec6c3b794a8d1a4e51430b65fbac2af82edb7e2
+  data.tar.gz: eaf0e7543c579f3d279d7dee8e31bd3ffcd80f33
 SHA512:
-  metadata.gz: 25964d97c7ab880d5309f1eff155318de9d0fabc1ca7a66f5d9258887e6187efc519d6cb514bd02e54ab585cf5702679e3df8ebece0c86a17c0530828086c95e
-  data.tar.gz: d11d80b80c58577cf770b3cfea6f369fdb265221ec3aa9ce0f499c317d9dfeff89cb719dbb038ed18095e631adba0da895bb18a6e7eb312a827c918c16e99a49
+  metadata.gz: a5c0b4c8a6cb3521cb3b8911a58adf1e3a5db700271dcdb92f73fc84a19f6df5e745afc30cb87cd5f7fe0ddab7b62606e39db02ad5a954062c8bdd822e2bde2b
+  data.tar.gz: e026c373a0d75f3f3acb3c6bf6191373985d15650a1712e02a113492de9bda6a679f8d9a32f9c8b74b40d377bf1490d299b41c579439a63df488847ec00b3d87

data/Rakefile

@@ -88,6 +88,10 @@ def collect_binary_files(binary_dir)
   binary_files
 end
 
+def windows_gem_name(spec, architecture)
+  "#{spec.name}-#{spec.version}-#{architecture}-mingw32.gem"
+end
+
 relative_vendor_dir = "vendor"
 relative_binary_dir = File.join("vendor", "local")
 vendor_dir = File.join(base_dir, relative_vendor_dir)
@@ -149,13 +153,13 @@ namespace :clean do
   end
 end
 
-namespace :build do
-  architectures = [:x86, :x64]
+windows_architectures = [:x86, :x64]
 
+namespace :build do
   namespace :windows do
     ruby_versions = "2.0.0:2.1.6:2.2.2"
 
-    architectures.each do |architecture|
+    windows_architectures.each do |architecture|
       desc "Build gem for Windows #{architecture}"
       task architecture do
         build_dir = "tmp/windows"
@@ -179,18 +183,26 @@ namespace :build do
         require "rake_compiler_dock"
         RakeCompilerDock.sh(raw_command_line)
 
-        version = spec.version
-        cp("#{build_dir}/pkg/rroonga-#{version}-#{architecture}-mingw32.gem",
+        cp("#{build_dir}/pkg/#{windows_gem_name(spec, architecture)}",
            "pkg/")
       end
     end
   end
 
   desc "Build gems for Windows"
-  build_tasks = architectures.collect do |architecture|
+  build_tasks = windows_architectures.collect do |architecture|
     "windows:#{architecture}"
   end
   task :windows => build_tasks
 end
 
+namespace :release do
+  desc "Push gems for Windows to RubyGems.org"
+  task :windows do
+    windows_architectures.each do |architecture|
+      ruby("-S", "gem", "push", "pkg/#{windows_gem_name(spec, architecture)}")
+    end
+  end
+end
+
 task :default => :test

data/ext/groonga/rb-grn-conf.c

@@ -0,0 +1,145 @@
+/* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+  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
+*/
+
+#include "rb-grn.h"
+
+#define SELF(object) (RVAL2GRNCONTEXT(object))
+
+/*
+ * Document-class: Groonga::Conf
+ *
+ * This class manages database global configurations. Each
+ * configuration is key and value pair.
+ */
+
+/*
+ * Creates a new configuration set for `context`.
+ *
+ * @overload initialize(context=nil)
+ *   @param [Groonga::Context, nil] context The context to be configured.
+ *     If `context` is `nil`, {Groonga::Context.default} is used.
+ *
+ * @since 5.0.9
+ */
+static VALUE
+rb_grn_conf_initialize (VALUE self, VALUE rb_context)
+{
+    rb_iv_set(self, "@context", rb_context);
+
+    return Qnil;
+}
+
+/*
+ * Gets a configuration value for key.
+ *
+ * @overload conf[](key)
+ *   @param [String] key The key.
+ *   @return [String, nil] The value associated with `key`.
+ *
+ * @since 5.0.9
+ */
+static VALUE
+rb_grn_conf_get (VALUE self, VALUE rb_key)
+{
+    VALUE rb_context;
+    VALUE rb_value;
+    grn_ctx *context;
+    const char *key;
+    int key_size;
+    const char *value;
+    uint32_t value_size;
+
+    rb_context = rb_iv_get(self, "@context");
+    context = rb_grn_context_ensure(&rb_context);
+
+    rb_key = rb_grn_convert_to_string(rb_key);
+    key = RSTRING_PTR(rb_key);
+    key_size = RSTRING_LEN(rb_key);
+
+    {
+        grn_rc rc;
+        rc = grn_conf_get(context,
+                          key, key_size,
+                          &value, &value_size);
+        rb_grn_context_check(context, self);
+        rb_grn_rc_check(rc, self);
+    }
+
+    if (value_size == 0) {
+        rb_value = Qnil;
+    } else {
+        rb_value = rb_grn_context_rb_string_new(context, value, value_size);
+    }
+
+    return rb_value;
+}
+
+/*
+ * Sets a configuration key and value pair.
+ *
+ * @overload conf[]=(key, value)
+ *   @param [String] key The key.
+ *   @param [String] value The value to be assigned.
+ *   @return [String] `value`.
+ */
+static VALUE
+rb_grn_conf_set (VALUE self, VALUE rb_key, VALUE rb_value)
+{
+    VALUE rb_value_original = rb_value;
+    VALUE rb_context;
+    grn_ctx *context;
+    const char *key;
+    int key_size;
+    const char *value;
+    int value_size;
+
+    rb_context = rb_iv_get(self, "@context");
+    context = rb_grn_context_ensure(&rb_context);
+
+    rb_key = rb_grn_convert_to_string(rb_key);
+    key = RSTRING_PTR(rb_key);
+    key_size = RSTRING_LEN(rb_key);
+
+    rb_value = rb_grn_convert_to_string(rb_value);
+    value = RSTRING_PTR(rb_value);
+    value_size = RSTRING_LEN(rb_value);
+
+    {
+        grn_rc rc;
+        rc = grn_conf_set(context,
+                          key, key_size,
+                          value, value_size);
+        rb_grn_context_check(context, self);
+        rb_grn_rc_check(rc, self);
+    }
+
+    return rb_value_original;
+}
+
+void
+rb_grn_init_conf (VALUE mGrn)
+{
+    VALUE cGrnConf;
+
+    cGrnConf = rb_define_class_under(mGrn, "Conf", rb_cObject);
+
+    rb_define_method(cGrnConf, "initialize", rb_grn_conf_initialize, 1);
+
+    rb_define_method(cGrnConf, "[]", rb_grn_conf_get, 1);
+    rb_define_method(cGrnConf, "[]=", rb_grn_conf_set, 2);
+}

data/ext/groonga/rb-grn-expression.c

@@ -824,6 +824,37 @@ rb_grn_expression_estimate_size (VALUE self)
     return UINT2NUM(size);
 }
 
+/*
+ * Rewrites expression.
+ *
+ * @example
+ *   expression.parse("age >= 10 AND age < 20",
+ *                    :syntax => :script)
+ *   expression.rewrite # => New rewritten expression.
+ *                      #    It'll use between(age, 10, "include", 20, "exclude")
+ *
+ * @overload rewrite
+ *   @return [Groonga::Expression, nil] new rewritten expression when
+ *      the expression is rewritten, `nil` otherwise.
+ *
+ * @since 5.1.0
+ */
+static VALUE
+rb_grn_expression_rewrite (VALUE self)
+{
+    grn_ctx *context = NULL;
+    grn_obj *expression;
+    grn_obj *rewritten_expression;
+
+    rb_grn_expression_deconstruct(SELF(self), &expression, &context,
+                                  NULL, NULL,
+                                  NULL, NULL, NULL);
+
+    rewritten_expression = grn_expr_rewrite(context, expression);
+
+    return GRNOBJECT2RVAL(Qnil, context, rewritten_expression, GRN_TRUE);
+}
+
 void
 rb_grn_init_expression (VALUE mGrn)
 {
@@ -865,4 +896,7 @@ rb_grn_init_expression (VALUE mGrn)
 
     rb_define_method(rb_cGrnExpression, "estimate_size",
                      rb_grn_expression_estimate_size, 0);
+
+    rb_define_method(rb_cGrnExpression, "rewrite",
+                     rb_grn_expression_rewrite, 0);
 }

data/ext/groonga/rb-grn-table.c

@@ -1313,6 +1313,118 @@ rb_grn_table_sort (int argc, VALUE *argv, VALUE self)
     return GRNOBJECT2RVAL(Qnil, context, result, GRN_TRUE);
 }
 
+/*
+ * Sorts records in the table by `TokyoGeoPoint` or `WGS84GeoPoint`
+ * type column value. Order is near to far from base geo point.
+ *
+ * @overload geo_sort(column, base_geo_point, options={})
+ *   @param options [::Hash] The name and value
+ *     pairs. Omitted names are initialized as the default value.
+ *
+ *   @option options :offset (0)
+ *
+ *     It specifies what number record should be the first record in
+ *     returned table. It's 0-based.
+ *
+ *     If you specify `0`, the 0th record, the 1st record, the 2nd
+ *     record, ... are returned.
+ *
+ *     If you specify `0`, the 1st record, the 2nd record, ... are
+ *     returned. The 0th record isn't returned.
+ *
+ *     The default is `0`.
+ *
+ *   @option options :limit (-1)
+ *
+ *     It specifies up to how many records are returned. If `-1` is
+ *     specified, all records are returned.
+ *
+ *     The default is `-1`.
+ *
+ * @return [Groonga::Array] The sorted result. You can get the
+ *   original record by {#value} method of a record in the sorted
+ *   result. Normally, you doesn't need to get the original record
+ *   because you can access via column name method:
+ *
+ *   If you want to access the key of the original record, you need to
+ *   get the original record.
+ *
+ * @since 5.0.9
+ */
+static VALUE
+rb_grn_table_geo_sort (int argc, VALUE *argv, VALUE self)
+{
+    grn_ctx *context = NULL;
+    grn_obj *table;
+    VALUE rb_column;
+    VALUE rb_base_geo_point;
+    VALUE rb_options;
+    VALUE rb_offset;
+    VALUE rb_limit;
+    grn_obj *column;
+    grn_id column_range_id;
+    grn_obj base_geo_point;
+    int offset = 0;
+    int limit = -1;
+    grn_obj *result;
+    VALUE exception;
+
+    rb_grn_table_deconstruct(SELF(self), &table, &context,
+                             NULL, NULL,
+                             NULL, NULL, NULL,
+                             NULL);
+
+    rb_scan_args(argc, argv, "21", &rb_column, &rb_base_geo_point, &rb_options);
+
+    column = RVAL2GRNCOLUMN(rb_column, &context);
+    column_range_id = grn_obj_get_range(context, column);
+    switch (column_range_id) {
+    case GRN_DB_TOKYO_GEO_POINT:
+        GRN_TOKYO_GEO_POINT_INIT(&base_geo_point, 0);
+        break;
+    case GRN_DB_WGS84_GEO_POINT:
+        GRN_WGS84_GEO_POINT_INIT(&base_geo_point, 0);
+        break;
+    default:
+        rb_raise(rb_eArgError,
+                 "column's range must be TokyoGeoPoint or WGS84GeoPoint: %s",
+                 rb_grn_inspect(rb_column));
+        break;
+    }
+    RVAL2GRNBULK_WITH_TYPE(rb_base_geo_point,
+                           context,
+                           &base_geo_point,
+                           column_range_id,
+                           grn_ctx_at(context, column_range_id));
+
+    rb_grn_scan_options(rb_options,
+                        "offset", &rb_offset,
+                        "limit", &rb_limit,
+                        NULL);
+
+    if (!NIL_P(rb_offset))
+        offset = NUM2INT(rb_offset);
+    if (!NIL_P(rb_limit))
+        limit = NUM2INT(rb_limit);
+    /* TODO: Remove me when Groonga 5.1.0 is released. */
+    if (limit < 0)
+        limit = grn_table_size(context, table) + limit + 1;
+
+    result = grn_table_create(context, NULL, 0, NULL, GRN_TABLE_NO_KEY,
+                              NULL, table);
+    grn_geo_table_sort(context, table, offset, limit,
+                       result, column, &base_geo_point);
+    exception = rb_grn_context_to_exception(context, self);
+    if (!NIL_P(exception)) {
+        grn_obj_unlink(context, &base_geo_point);
+        grn_obj_unlink(context, result);
+        rb_exc_raise(exception);
+    }
+
+    grn_obj_unlink(context, &base_geo_point);
+    return GRNOBJECT2RVAL(Qnil, context, result, GRN_TRUE);
+}
+
 /*
  * _table_ のレコードを _key1_ , _key2_ , _..._ で指定したキーの
  * 値でグループ化する。多くの場合、キーにはカラムを指定する。
@@ -2608,6 +2720,7 @@ rb_grn_init_table (VALUE mGrn)
     rb_define_method(rb_cGrnTable, "delete", rb_grn_table_delete, -1);
 
     rb_define_method(rb_cGrnTable, "sort", rb_grn_table_sort, -1);
+    rb_define_method(rb_cGrnTable, "geo_sort", rb_grn_table_geo_sort, -1);
     rb_define_method(rb_cGrnTable, "group", rb_grn_table_group, -1);
 
     rb_define_method(rb_cGrnTable, "[]", rb_grn_table_array_reference, 1);

data/ext/groonga/rb-grn-utils.c

@@ -174,7 +174,11 @@ rb_grn_equal_string (const char *string1, const char *string2)
 VALUE
 rb_grn_convert_to_string (VALUE object)
 {
-    return rb_convert_type(object, RUBY_T_STRING, "String", "to_str");
+    if (rb_type(object) == T_SYMBOL) {
+        return rb_sym2str(object);
+    } else {
+        return rb_convert_type(object, RUBY_T_STRING, "String", "to_str");
+    }
 }
 
 VALUE

data/ext/groonga/rb-grn.h

@@ -101,7 +101,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 5
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 8
+#define RB_GRN_MICRO_VERSION 9
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -354,6 +354,7 @@ void           rb_grn_init_snippet                  (VALUE mGrn);
 void           rb_grn_init_plugin                   (VALUE mGrn);
 void           rb_grn_init_normalizer               (VALUE mGrn);
 void           rb_grn_init_thread                   (VALUE mGrn);
+void           rb_grn_init_conf                     (VALUE mGrn);
 
 VALUE          rb_grn_rc_to_exception               (grn_rc rc);
 const char    *rb_grn_rc_to_message                 (grn_rc rc);

data/ext/groonga/rb-groonga.c

@@ -192,4 +192,5 @@ Init_groonga (void)
     rb_grn_init_plugin(mGrn);
     rb_grn_init_normalizer(mGrn);
     rb_grn_init_thread(mGrn);
+    rb_grn_init_conf(mGrn);
 }

data/lib/groonga/context.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2010-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-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
@@ -346,5 +346,13 @@ module Groonga
       memory_pool = @memory_pools.last
       memory_pool.register(object)
     end
+
+    # @return [Groonga::Conf] The database level configuration sets of
+    #   this context.
+    #
+    # @since 5.0.9
+    def conf
+      @conf ||= Conf.new(self)
+    end
   end
 end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 5.0.8
+  version: 5.0.9
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -244,6 +244,7 @@ files:
 - ext/groonga/rb-grn-array-cursor.c
 - ext/groonga/rb-grn-array.c
 - ext/groonga/rb-grn-column.c
+- ext/groonga/rb-grn-conf.c
 - ext/groonga/rb-grn-context.c
 - ext/groonga/rb-grn-database.c
 - ext/groonga/rb-grn-double-array-trie-cursor.c
@@ -327,6 +328,7 @@ files:
 - test/test-array.rb
 - test/test-column.rb
 - test/test-command-select.rb
+- test/test-conf.rb
 - test/test-context.rb
 - test/test-convert.rb
 - test/test-database-dumper.rb
@@ -416,6 +418,7 @@ test_files:
 - test/test-windows-event-logger.rb
 - test/test-table-select-normalize.rb
 - test/test-lock-timeout.rb
+- test/test-conf.rb
 - test/test-record.rb
 - test/test-plugin.rb
 - test/groonga-test-utils.rb