rroonga 1.3.0 → 1.3.1

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

data/test/test-schema-dumper.rb

@@ -28,6 +28,29 @@ class SchemaDumperTest < Test::Unit::TestCase
     end
   end
 
+  def define_built_in_types_schema
+    Groonga::Schema.define do |schema|
+      schema.create_table("Posts") do |table|
+        table.boolean :public
+        table.int8 :int8
+        table.uint8 :uint8
+        table.int16 :int16
+        table.uint16 :uint16
+        table.int32 :int32
+        table.uint32 :uint32
+        table.int64 :int64
+        table.uint64 :uint64
+        table.float :vote_average
+        table.time :published_at
+        table.short_text :title
+        table.text :content
+        table.long_text :attachment
+        table.tokyo_geo_point :location_tokyo
+        table.wgs84_geo_point :location_wgs84
+      end
+    end
+  end
+
   def define_reference_schema
     Groonga::Schema.define do |schema|
       schema.create_table("Items") do |table|
@@ -79,6 +102,31 @@ end
 EOS
     end
 
+    def test_built_in_types
+      define_built_in_types_schema
+      assert_equal(<<-EOS, dump)
+create_table("Posts",
+             :force => true) do |table|
+  table.long_text("attachment")
+  table.text("content")
+  table.integer16("int16")
+  table.integer32("int32")
+  table.integer64("int64")
+  table.integer8("int8")
+  table.tokyo_geo_point("location_tokyo")
+  table.wgs84_geo_point("location_wgs84")
+  table.boolean("public")
+  table.time("published_at")
+  table.short_text("title")
+  table.unsigned_integer16("uint16")
+  table.unsigned_integer32("uint32")
+  table.unsigned_integer64("uint64")
+  table.unsigned_integer8("uint8")
+  table.float("vote_average")
+end
+EOS
+    end
+
     def test_reference
       define_reference_schema
       assert_equal(<<-EOS, dump)

data/test/test-schema-type.rb

@@ -33,6 +33,18 @@ class SchemaTypeTest < Test::Unit::TestCase
     assert_normalize_type("LongText", "LongText")
   end
 
+  def test_normalize_integer8
+    assert_normalize_type("Int8", "int8")
+    assert_normalize_type("Int8", "integer8")
+    assert_normalize_type("Int8", "Int8")
+  end
+
+  def test_normalize_integer16
+    assert_normalize_type("Int16", "int16")
+    assert_normalize_type("Int16", "integer16")
+    assert_normalize_type("Int16", "Int16")
+  end
+
   def test_normalize_integer32
     assert_normalize_type("Int32", "int")
     assert_normalize_type("Int32", "integer")
@@ -47,6 +59,18 @@ class SchemaTypeTest < Test::Unit::TestCase
     assert_normalize_type("Int64", "Int64")
   end
 
+  def test_normalize_unsigned_integer8
+    assert_normalize_type("UInt8", "uint8")
+    assert_normalize_type("UInt8", "unsigned_integer8")
+    assert_normalize_type("UInt8", "UInt8")
+  end
+
+  def test_normalize_unsigned_integer16
+    assert_normalize_type("UInt16", "uint16")
+    assert_normalize_type("UInt16", "unsigned_integer16")
+    assert_normalize_type("UInt16", "UInt16")
+  end
+
   def test_normalize_unsigned_integer32
     assert_normalize_type("UInt32", "uint")
     assert_normalize_type("UInt32", "unsigned_integer")
@@ -79,6 +103,17 @@ class SchemaTypeTest < Test::Unit::TestCase
     assert_normalize_type("Bool", "Bool")
   end
 
+  def test_normalize_tokyo_geo_point
+    assert_normalize_type("TokyoGeoPoint", "tokyo_geo_point")
+    assert_normalize_type("TokyoGeoPoint", "TokyoGeoPoint")
+  end
+
+  def test_normalize_wgs84_geo_point
+    assert_normalize_type("WGS84GeoPoint", "geo_point")
+    assert_normalize_type("WGS84GeoPoint", "wgs84_geo_point")
+    assert_normalize_type("WGS84GeoPoint", "WGS84GeoPoint")
+  end
+
   def test_normalize_delimit
     assert_normalize_type("TokenDelimit", "delimit")
     assert_normalize_type("TokenDelimit", "token_delimit")

data/test/test-schema.rb

@@ -343,6 +343,22 @@ class SchemaTest < Test::Unit::TestCase
     end
   end
 
+  def test_integer8_column
+    assert_nil(context["Posts.rate"])
+    Groonga::Schema.create_table("Posts") do |table|
+      table.integer8 :rate
+    end
+    assert_equal(context["Int8"], context["Posts.rate"].range)
+  end
+
+  def test_integer16_column
+    assert_nil(context["Posts.rate"])
+    Groonga::Schema.create_table("Posts") do |table|
+      table.integer16 :rate
+    end
+    assert_equal(context["Int16"], context["Posts.rate"].range)
+  end
+
   def test_integer32_column
     assert_nil(context["Posts.rate"])
     Groonga::Schema.create_table("Posts") do |table|
@@ -359,6 +375,22 @@ class SchemaTest < Test::Unit::TestCase
     assert_equal(context["Int64"], context["Posts.rate"].range)
   end
 
+  def test_unsigned_integer8_column
+    assert_nil(context["Posts.n_viewed"])
+    Groonga::Schema.create_table("Posts") do |table|
+      table.unsigned_integer8 :n_viewed
+    end
+    assert_equal(context["UInt8"], context["Posts.n_viewed"].range)
+  end
+
+  def test_unsigned_integer16_column
+    assert_nil(context["Posts.n_viewed"])
+    Groonga::Schema.create_table("Posts") do |table|
+      table.unsigned_integer16 :n_viewed
+    end
+    assert_equal(context["UInt16"], context["Posts.n_viewed"].range)
+  end
+
   def test_unsigned_integer32_column
     assert_nil(context["Posts.n_viewed"])
     Groonga::Schema.create_table("Posts") do |table|
@@ -433,6 +465,30 @@ class SchemaTest < Test::Unit::TestCase
     assert_equal(context["Bool"], context["Posts.public"].range)
   end
 
+  def test_tokyo_geo_point_column
+    assert_nil(context["Posts.location"])
+    Groonga::Schema.create_table("Posts") do |table|
+      table.tokyo_geo_point :location
+    end
+    assert_equal(context["TokyoGeoPoint"], context["Posts.location"].range)
+  end
+
+  def test_wgs84_geo_point_column
+    assert_nil(context["Posts.location"])
+    Groonga::Schema.create_table("Posts") do |table|
+      table.wgs84_geo_point :location
+    end
+    assert_equal(context["WGS84GeoPoint"], context["Posts.location"].range)
+  end
+
+  def test_geo_point_column
+    assert_nil(context["Posts.location"])
+    Groonga::Schema.create_table("Posts") do |table|
+      table.geo_point :location
+    end
+    assert_equal(context["WGS84GeoPoint"], context["Posts.location"].range)
+  end
+
   def test_remove_column
     Groonga::Schema.create_table("Posts") do |table|
       table.long_text :content
@@ -456,26 +512,40 @@ class SchemaTest < Test::Unit::TestCase
     assert_equal("Posts.body", content.name)
   end
 
-  def test_column_again
-    Groonga::Schema.create_table("Posts") do |table|
-      table.text :content
+  class DefineColumnAgainTest < self
+    def test_same_option
+      Groonga::Schema.create_table("Posts") do |table|
+        table.text :content
+      end
+
+      assert_nothing_raised do
+        Groonga::Schema.create_table("Posts") do |table|
+          table.text :content
+        end
+      end
     end
 
-    assert_nothing_raised do
+    def test_difference_type
       Groonga::Schema.create_table("Posts") do |table|
         table.text :content
       end
-    end
-  end
 
-  def test_column_again_with_difference_type
-    Groonga::Schema.create_table("Posts") do |table|
-      table.text :content
+      assert_raise(Groonga::Schema::ColumnCreationWithDifferentOptions) do
+        Groonga::Schema.create_table("Posts") do |table|
+          table.integer :content
+        end
+      end
     end
 
-    assert_raise(Groonga::Schema::ColumnCreationWithDifferentOptions) do
+    def test_same_option_by_groonga_object
       Groonga::Schema.create_table("Posts") do |table|
-        table.integer :content
+        table.text :content
+      end
+
+      assert_nothing_raised do
+        Groonga::Schema.create_table("Posts") do |table|
+          table.column(:content, Groonga["Text"])
+        end
       end
     end
   end