rroonga 1.3.0-x86-mingw32 → 1.3.1-x86-mingw32

data/ext/groonga/rb-grn.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2012  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
@@ -72,7 +72,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 1
 #define RB_GRN_MINOR_VERSION 3
-#define RB_GRN_MICRO_VERSION 0
+#define RB_GRN_MICRO_VERSION 1
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -227,7 +227,6 @@ RB_GRN_VAR VALUE rb_cGrnAccessor;
 RB_GRN_VAR VALUE rb_cGrnViewAccessor;
 RB_GRN_VAR VALUE rb_cGrnRecord;
 RB_GRN_VAR VALUE rb_cGrnViewRecord;
-RB_GRN_VAR VALUE rb_cGrnQuery;
 RB_GRN_VAR VALUE rb_cGrnLogger;
 RB_GRN_VAR VALUE rb_cGrnSnippet;
 RB_GRN_VAR VALUE rb_cGrnVariable;
@@ -270,7 +269,6 @@ void           rb_grn_init_accessor                 (VALUE mGrn);
 void           rb_grn_init_view_accessor            (VALUE mGrn);
 void           rb_grn_init_record                   (VALUE mGrn);
 void           rb_grn_init_view_record              (VALUE mGrn);
-void           rb_grn_init_query                    (VALUE mGrn);
 void           rb_grn_init_variable                 (VALUE mGrn);
 void           rb_grn_init_operator                 (VALUE mGrn);
 void           rb_grn_init_expression               (VALUE mGrn);
@@ -555,9 +553,6 @@ VALUE          rb_grn_column_expression_builder_build
 #define GRNACCESSOR2RVAL(context, accessor, owner) \
     (rb_grn_accessor_to_ruby_object(context, accessor, owner))
 
-#define RVAL2GRNQUERY(object)         (rb_grn_query_from_ruby_object(object))
-#define GRNQUERY2RVAL(context, column)(rb_grn_query_to_ruby_object(context, column))
-
 #define RVAL2GRNOPERATOR(object)      (rb_grn_operator_from_ruby_object(object))
 
 #define RVAL2GRNLOGGER(object)        (rb_grn_logger_from_ruby_object(object))
@@ -665,10 +660,6 @@ VALUE          rb_grn_index_cursor_to_ruby_object   (grn_ctx *context,
 						     grn_obj *cursor,
 						     grn_bool owner);
 
-grn_query     *rb_grn_query_from_ruby_object        (VALUE object);
-VALUE          rb_grn_query_to_ruby_object          (grn_ctx *context,
-						     grn_query *query);
-
 grn_operator   rb_grn_operator_from_ruby_object     (VALUE object);
 
 grn_logger_info *

data/ext/groonga/rb-groonga.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2012  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
@@ -138,7 +138,6 @@ Init_groonga (void)
     rb_grn_init_view_accessor(mGrn);
     rb_grn_init_record(mGrn);
     rb_grn_init_view_record(mGrn);
-    rb_grn_init_query(mGrn);
     rb_grn_init_variable(mGrn);
     rb_grn_init_operator(mGrn);
     rb_grn_init_expression(mGrn);

data/lib/groonga/command.rb

@@ -0,0 +1,169 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+module Groonga
+  module Command
+    class Builder
+      class << self
+        def escape_value(value)
+          escaped_value = value.to_s.gsub(/"/, '\\"')
+          "\"#{escaped_value}\""
+        end
+      end
+
+      attr_reader :command, :arguments
+      def initialize(command, arguments={})
+        @command = command
+        @arguments = arguments
+      end
+
+      def [](key)
+        @arguments[key]
+      end
+
+      def []=(key, value)
+        @arguments[key] = value
+      end
+
+      def build
+        query = "#{@command} "
+        @arguments.each do |key, value|
+          value = value.join(", ") if value.is_a?(::Array)
+          escaped_value = self.class.escape_value(value)
+          query << " --#{key} #{escaped_value}"
+        end
+        query
+      end
+    end
+
+    class Select
+      def initialize(context, table, options)
+        @context = context
+        @table = table
+        @options = normalize_options(options)
+      end
+
+      def exec
+        request_id = @context.send(query)
+        loop do
+          response_id, result = @context.receive
+          if request_id == response_id
+            drill_down_keys = @options["drilldown"]
+            if drill_down_keys.is_a?(String)
+              drill_down_keys = drill_down_keys.split(/(?:\s+|\s*,\s*)/)
+            end
+            return Result.parse(result, drill_down_keys)
+          end
+          # raise if request_id < response_id
+        end
+      end
+
+      private
+      def normalize_options(options)
+        normalized_options = {}
+        options.each do |key, value|
+          normalized_options[normalize_option_name(key)] = value
+        end
+        normalized_options
+      end
+
+      def normalize_option_name(name)
+        name = name.to_s.gsub(/-/, "_").gsub(/drill_down/, "drilldown")
+        name.gsub(/sort_by/, 'sortby')
+      end
+
+      def query
+        if @table.is_a?(String)
+          table_name = @table
+        else
+          table_name = @table.name
+        end
+        builder = Builder.new("select", @options.merge(:table => table_name))
+        builder.build
+      end
+
+      class Result < Struct.new(:n_hits, :columns, :values, :drill_down)
+        class << self
+          def parse(json, drill_down_keys)
+            select_result, *drill_down_results = JSON.parse(json)
+            result = new
+            n_hits, columns, values = extract_result(select_result)
+            result.n_hits = n_hits
+            result.columns = columns
+            result.values = values
+            if drill_down_results
+              result.drill_down = parse_drill_down_results(drill_down_results,
+                                                           drill_down_keys)
+            end
+            result
+          end
+
+          def create_records(columns, values)
+            records = []
+            values.each do |value|
+              record = {}
+              columns.each_with_index do |(name, type), i|
+                record[name] = convert_value(value[i], type)
+              end
+              records << record
+            end
+            records
+          end
+
+          private
+          def parse_drill_down_results(results, keys)
+            named_results = {}
+            results.each_with_index do |drill_down, i|
+              n_hits, columns, values = extract_result(drill_down)
+              drill_down_result = DrillDownResult.new
+              drill_down_result.n_hits = n_hits
+              drill_down_result.columns = columns
+              drill_down_result.values = values
+              named_results[keys[i]] = drill_down_result
+            end
+            named_results
+          end
+
+          def extract_result(result)
+            meta_data, columns, *values = result
+            n_hits, = meta_data
+            [n_hits, columns, values]
+          end
+
+          def convert_value(value, type)
+            case type
+            when "Time"
+              Time.at(value)
+            else
+              value
+            end
+          end
+        end
+
+        def records
+          @records ||= self.class.create_records(columns, values)
+        end
+
+        class DrillDownResult < Struct.new(:n_hits, :columns, :values)
+          def records
+            @records ||= Result.create_records(columns, values)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/groonga/context.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2010-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2012  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
@@ -15,6 +15,8 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+require "groonga/command"
+
 module Groonga
   class Context
     # _path_ にある既存のデータベースを開く。ブロックを指定した場
@@ -70,130 +72,8 @@ module Groonga
     # @option options [Array] XXX TODO
     #   TODO
     def select(table, options={})
-      select = SelectCommand.new(self, table, options)
+      select = Command::Select.new(self, table, options)
       select.exec
     end
-
-    class SelectResult < Struct.new(:n_hits, :columns, :values,
-                                    :drill_down)
-      class << self
-        def parse(json, drill_down_keys)
-          select_result, *drill_down_results = JSON.parse(json)
-          result = new
-          n_hits, columns, values = extract_result(select_result)
-          result.n_hits = n_hits
-          result.columns = columns
-          result.values = values
-          if drill_down_results
-            result.drill_down = parse_drill_down_results(drill_down_results,
-                                                         drill_down_keys)
-          end
-          result
-        end
-
-        def create_records(columns, values)
-          records = []
-          values.each do |value|
-            record = {}
-            columns.each_with_index do |(name, type), i|
-              record[name] = convert_value(value[i], type)
-            end
-            records << record
-          end
-          records
-        end
-
-        private
-        def parse_drill_down_results(results, keys)
-          named_results = {}
-          results.each_with_index do |drill_down, i|
-            n_hits, columns, values = extract_result(drill_down)
-            drill_down_result = DrillDownResult.new
-            drill_down_result.n_hits = n_hits
-            drill_down_result.columns = columns
-            drill_down_result.values = values
-            named_results[keys[i]] = drill_down_result
-          end
-          named_results
-        end
-
-        def extract_result(result)
-          meta_data, columns, *values = result
-          n_hits, = meta_data
-          [n_hits, columns, values]
-        end
-
-        def convert_value(value, type)
-          case type
-          when "Time"
-            Time.at(value)
-          else
-            value
-          end
-        end
-      end
-
-      def records
-        @records ||= self.class.create_records(columns, values)
-      end
-
-      class DrillDownResult < Struct.new(:n_hits, :columns, :values)
-        def records
-          @records ||= SelectResult.create_records(columns, values)
-        end
-      end
-    end
-
-    class SelectCommand
-      def initialize(context, table, options)
-        @context = context
-        @table = table
-        @options = normalize_options(options)
-      end
-
-      def exec
-        request_id = @context.send(query)
-        loop do
-          response_id, result = @context.receive
-          if request_id == response_id
-            drill_down_keys = @options["drilldown"]
-            if drill_down_keys.is_a?(String)
-              drill_down_keys = drill_down_keys.split(/(?:\s+|\s*,\s*)/)
-            end
-            return SelectResult.parse(result, drill_down_keys)
-          end
-          # raise if request_id < response_id
-        end
-      end
-
-      private
-      def normalize_options(options)
-        normalized_options = {}
-        options.each do |key, value|
-          normalized_options[normalize_option_name(key)] = value
-        end
-        normalized_options
-      end
-
-      def normalize_option_name(name)
-        name = name.to_s.gsub(/-/, "_").gsub(/drill_down/, "drilldown")
-        name.gsub(/sort_by/, 'sortby')
-      end
-
-      def query
-        if @table.is_a?(String)
-          table_name = @table
-        else
-          table_name = @table.name
-        end
-        _query = "select #{table_name}"
-        @options.each do |key, value|
-          value = value.join(", ") if value.is_a?(::Array)
-          escaped_value = value.to_s.gsub(/"/, '\\"')
-          _query << " --#{key} \"#{escaped_value}\""
-        end
-        _query
-      end
-    end
   end
 end

data/lib/groonga/dumper.rb

@@ -302,14 +302,12 @@ module Groonga
       def column_method(column)
         range = column.range
         case range.name
-        when "Int32"
-          "integer32"
-        when "Int64"
-          "integer64"
-        when "UInt32"
-          "unsigned_integer32"
-        when "UInt64"
-          "unsigned_integer64"
+        when "Bool"
+          "boolean"
+        when /\AInt(8|16|32|64)\z/
+          "integer#{$1}"
+        when /\AUInt(8|16|32|64)\z/
+          "unsigned_integer#{$1}"
         when "Float"
           "float"
         when "Time"
@@ -320,6 +318,10 @@ module Groonga
           "text"
         when "LongText"
           "long_text"
+        when "TokyoGeoPoint"
+          "tokyo_geo_point"
+        when "WGS84GeoPoint"
+          "wgs84_geo_point"
         else
           raise ArgumentError, "unsupported column: #{column.inspect}"
         end

data/lib/groonga/record.rb

@@ -161,6 +161,13 @@ module Groonga
       self["_score"]
     end
 
+    # Sets score. Score column exists only search result table.
+    #
+    # @param [Integer] new_score The new score.
+    def score=(new_score)
+      self["_score"] = new_score
+    end
+
     # Groonga::Record#scoreが利用できる場合は +true+ を
     # 返す。
     def support_score?

data/lib/groonga/schema.rb

@@ -516,6 +516,10 @@ module Groonga
         "text" => "Text",
         "binary" => "LongText",
         "long_text" => "LongText",
+        "int8" => "Int8",
+        "integer8" => "Int8",
+        "int16" => "Int16",
+        "integer16" => "Int16",
         "int" => "Int32",
         "integer" => "Int32",
         "int32" => "Int32",
@@ -523,6 +527,10 @@ module Groonga
         "decimal" => "Int64",
         "int64" => "Int64",
         "integer64" => "Int64",
+        "uint8" => "UInt8",
+        "unsigned_integer8" => "UInt8",
+        "uint16" => "UInt16",
+        "unsigned_integer16" => "UInt16",
         "uint" => "UInt32",
         "unsigned_integer" => "UInt32",
         "uint32" => "UInt32",
@@ -535,6 +543,9 @@ module Groonga
         "time" => "Time",
         "date" => "Time",
         "boolean" => "Bool",
+        "tokyo_geo_point" => "TokyoGeoPoint",
+        "geo_point" => "WGS84GeoPoint",
+        "wgs84_geo_point" => "WGS84GeoPoint",
         "delimit" => "TokenDelimit",
         "token_delimit" => "TokenDelimit",
         "unigram" => "TokenUnigram",
@@ -1158,6 +1169,28 @@ module Groonga
         self
       end
 
+      # Defines a 8 bit signed integer column named @name@.
+      #
+      # @param [String or Symbol] name the column name
+      # @param [Hash] options ({}) the options
+      # @see Groonga::Schema::TableDefinition#column for
+      #    available @options@.
+      def integer8(name, options={})
+        column(name, "Int8", options)
+      end
+      alias_method :int8, :integer8
+
+      # Defines a 16 bit signed integer column named @name@.
+      #
+      # @param [String or Symbol] name the column name
+      # @param [Hash] options ({}) the options
+      # @see Groonga::Schema::TableDefinition#column for
+      #    available @options@.
+      def integer16(name, options={})
+        column(name, "Int16", options)
+      end
+      alias_method :int16, :integer16
+
       # 名前が _name_ の32bit符号付き整数のカラムを作成する。
       #
       # _options_ に指定可能な値は
@@ -1177,6 +1210,28 @@ module Groonga
       end
       alias_method :int64, :integer64
 
+      # Defines a 8 bit unsigned integer column named @name@.
+      #
+      # @param [String or Symbol] name the column name
+      # @param [Hash] options ({}) the options
+      # @see Groonga::Schema::TableDefinition#column for
+      #    available @options@.
+      def unsigned_integer8(name, options={})
+        column(name, "UInt8", options)
+      end
+      alias_method :uint8, :unsigned_integer8
+
+      # Defines a 16 bit unsigned integer column named @name@.
+      #
+      # @param [String or Symbol] name the column name
+      # @param [Hash] options ({}) the options
+      # @see Groonga::Schema::TableDefinition#column for
+      #    available @options@.
+      def unsigned_integer16(name, options={})
+        column(name, "UInt16", options)
+      end
+      alias_method :uint16, :unsigned_integer16
+
       # 名前が _name_ の32bit符号なし整数のカラムを作成する。
       #
       # _options_ に指定可能な値は
@@ -1272,6 +1327,40 @@ module Groonga
       end
       alias_method :bool, :boolean
 
+      # Defines a 8 bit signed integer column named @name@.
+      #
+      # @param [String or Symbol] name the column name
+      # @param [Hash] options ({}) the options
+      # @see Groonga::Schema::TableDefinition#column for
+      #    available @options@.
+      def integer8(name, options={})
+        column(name, "Int8", options)
+      end
+      alias_method :int8, :integer8
+
+      # Defines a geo point in Tokyo geodetic system column
+      # named @name@.
+      #
+      # @param [String or Symbol] name the column name
+      # @param [Hash] options ({}) the options
+      # @see Groonga::Schema::TableDefinition#column for
+      #    available @options@.
+      def tokyo_geo_point(name, options={})
+        column(name, "TokyoGeoPoint", options)
+      end
+
+      # Defines a geo point in WGS 84 (World Geodetic System) column
+      # named @name@.
+      #
+      # @param [String or Symbol] name the column name
+      # @param [Hash] options ({}) the options
+      # @see Groonga::Schema::TableDefinition#column for
+      #    available @options@.
+      def wgs84_geo_point(name, options={})
+        column(name, "WGS84GeoPoint", options)
+      end
+      alias_method :geo_point, :wgs84_geo_point
+
       # @private
       def [](name, definition_class=nil)
         @definitions.find do |definition|
@@ -1651,23 +1740,25 @@ module Groonga
           end
         end
         table.define_column(@name,
-                            normalize_type(context),
+                            resolved_type(context),
                             options)
       end
 
       private
-      def normalize_type(context)
+      def resolved_type(context)
+        return @type if @type.is_a?(Groonga::Object)
         if @type.respond_to?(:call)
-          resolved_type = @type.call(context)
+          resolved_type_name = @type.call(context)
         else
-          resolved_type = @type
+          resolved_type_name = @type
         end
-        Schema.normalize_type(resolved_type, :context => context)
+        normalized_type_name = Schema.normalize_type(resolved_type_name,
+                                                     :context => context)
+        context[normalized_type_name]
       end
 
       def same_column?(context, column)
-        # TODO: should check column type and other options.
-        column.range == context[normalize_type(context)]
+        column.range == resolved_type(context)
       end
 
       def define_options(context, table)

data/rroonga-build.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2012  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
@@ -18,8 +18,8 @@
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 1
-    MINOR = 2
-    MICRO = 8
+    MINOR = 3
+    MICRO = 0
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/{test-context-select.rb → test-command-select.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2012  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
@@ -13,7 +13,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-class ContextSelectTest < Test::Unit::TestCase
+class CommandSelectTest < Test::Unit::TestCase
   include GroongaTestUtils
 
   setup :setup_database
@@ -100,7 +100,7 @@ class ContextSelectTest < Test::Unit::TestCase
 
   def test_drill_down_with_no_hit
     result = context.select(@users,
-                            :filter => "_key == \"no hit\"",
+                            :filter => "_key == \"no\\ hit\"",
                             :output_columns => ["_key"],
                             :drill_down => ["_key", "book"],
                             :drill_down_output_columns => "_key",

data/test/test-record.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2012  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
@@ -233,6 +233,23 @@ class RecordTest < Test::Unit::TestCase
                  end)
   end
 
+  def test_score=
+    groonga = @bookmarks.add
+    groonga["content"] = "full text search search search engine."
+
+    google = @bookmarks.add
+    google["content"] = "Web search engine."
+
+    results = @bookmarks_content_index.search("search")
+    results.each do |record|
+      record.score *= 10
+    end
+    assert_equal([[groonga.id, 30], [google.id, 10]],
+                 results.collect do |record|
+                   [record.id, record.score]
+                 end)
+  end
+
   def test_increment!
     groonga = @bookmarks.add
     assert_equal(0, groonga["rate"])