groonga 0.0.6 → 0.0.7

data/test-unit/test/collector/test-load.rb

@@ -240,11 +240,7 @@ EOT
                      [:test, {:name => "test1_2"}]]],
                    @test_case1.to_s)
 
-    assert_collect([:suite, {:name => @no_load_sub_test_case5.basename.to_s},
-                    [:suite, {:name => _test_case_name("NoLoadSubTestCase5")},
-                     [:test, {:name => "test5_1"}],
-                     [:test, {:name => "test5_2"}]]],
-                   @no_load_sub_test_case5.to_s)
+    assert_collect(nil, @no_load_sub_test_case5.to_s)
   end
 
   def test_nil_pattern

data/test-unit/test/test-color-scheme.rb

@@ -8,6 +8,10 @@ class TestUnitColorScheme < Test::Unit::TestCase
                    "notification" => color("cyan", :bold => true),
                    "error" => color("yellow", :bold => true) +
                               color("black", :foreground => false),
+                   "case" => color("white", :bold => true) +
+                             color("blue", :foreground => false),
+                   "suite" => color("white", :bold => true) +
+                              color("green", :foreground => false),
                  },
                  Test::Unit::ColorScheme.default.to_hash)
   end

data/test/groonga-test-utils.rb

@@ -15,6 +15,9 @@
 
 require 'fileutils'
 require 'pathname'
+require 'time'
+require 'json'
+require 'pkg-config'
 
 require 'groonga'
 
@@ -88,4 +91,11 @@ module GroongaTestUtils
   def teardown_tmp_directory
     FileUtils.rm_rf(@tmp_dir.to_s)
   end
+
+  private
+  def assert_equal_select_result(expected, actual)
+    assert_equal(expected,
+                 actual.collect {|record| record.key},
+                 actual.expression.inspect)
+  end
 end

data/test/run-test.rb

@@ -43,11 +43,15 @@ ARGV.unshift("--priority-mode")
 
 $LOAD_PATH.unshift(ext_dir)
 $LOAD_PATH.unshift(lib_dir)
+$LOAD_PATH.unshift(base_dir)
 
 $LOAD_PATH.unshift(test_dir)
 require 'groonga-test-utils'
 
-Dir.glob("test/**/test{_,-}*.rb") do |file|
+pkg_config = File.join(base_dir, "vendor", "local", "lib", "pkgconfig")
+PackageConfig.prepend_default_path(pkg_config)
+
+Dir.glob("#{base_dir}/test/**/test{_,-}*.rb") do |file|
   require file.sub(/\.rb$/, '')
 end
 

data/test/test-column.rb

@@ -174,6 +174,64 @@ class ColumnTest < Test::Unit::TestCase
     assert_equal("title", title.local_name)
   end
 
+  def test_select
+    posts = Groonga::Hash.create(:name => "<posts>", :key_type => "<shorttext>")
+    body = posts.define_column("body", "<text>")
+
+    index = Groonga::PatriciaTrie.create(:name => "<terms>",
+                                         :key_type => "<shorttext>",
+                                         :key_normalize => true)
+    index.default_tokenizer = "<token:bigram>"
+    body_index = index.define_index_column("body_index", posts,
+                                           :with_position => true,
+                                           :source => body)
+
+    first_post = posts.add("Hello!", :body => "World")
+    hobby = posts.add("My Hobby", :body => "Drive and Eat")
+    
+    result = body.select("drive")
+    assert_equal(["Drive and Eat"],
+                 result.records.collect do |record|
+                   record["body"]
+                 end)
+  end
+
+  def test_select_with_block
+    posts = Groonga::Hash.create(:name => "<posts>", :key_type => "<shorttext>")
+    body = posts.define_column("body", "<text>")
+
+    index = Groonga::PatriciaTrie.create(:name => "<terms>",
+                                         :key_type => "<shorttext>",
+                                         :key_normalize => true)
+    index.default_tokenizer = "<token:bigram>"
+    body_index = index.define_index_column("body_index", posts,
+                                           :with_position => true,
+                                           :source => body)
+
+    first_post = posts.add("Hello!", :body => "World")
+    hobby = posts.add("My Hobby", :body => "Drive and Eat")
+    
+    result = body.select do |column|
+      column =~ "drive"
+    end
+    assert_equal(["Drive and Eat"],
+                 result.records.collect do |record|
+                   record["body"]
+                 end)
+  end
+
+  def test_set_time
+    posts = Groonga::Hash.create(:name => "<posts>", :key_type => "<shorttext>")
+    body = posts.define_column("issued", "<time>")
+
+    post = posts.add("hello", :issued => 123456)
+    assert_equal(Time.at(123456), post[".issued"])
+    post = posts.add("groonga", :issued => 1251380635)
+    assert_equal(Time.parse("2009-08-27 22:43:55"), post[".issued"])
+    post = posts.add("mroonga", :issued => 1251380635.1234567)
+    assert_in_delta(Time.at(1251380635.1234567).usec, post[".issued"].usec, 10)
+  end
+
   private
   def assert_content_search(expected_records, term)
     records = @bookmarks_index_content.search(term).records

data/test/test-database.rb

@@ -79,19 +79,26 @@ class DatabaseTest < Test::Unit::TestCase
                   "TokenMecab",
                   "TokenTrigram",
                   "TokenUnigram",
+                  "TokyoGeoPoint",
                   "UInt16",
                   "UInt32",
                   "UInt64",
                   "UInt8",
+                  "WGS84GeoPoint",
                   "column_create",
                   "column_list",
                   "define_selector",
                   "expr_missing",
                   "load",
+                  "now",
+                  "quit",
+                  "rand",
                   "select",
+                  "shutdown",
                   "status",
                   "table_create",
-                  "table_list"],
+                  "table_list",
+                  "view_add"],
                  database.collect {|object| object.name}.sort)
   end
 

data/test/test-expression.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -27,9 +28,10 @@ class ExpressionTest < Test::Unit::TestCase
     expression = Groonga::Expression.new
     expression.append_constant(morita)
     expression.append_constant("name")
-    expression.append_operation(Groonga::Operation::OBJECT_GET_VALUE, 2)
+    expression.append_operation(Groonga::Operation::GET_VALUE, 2)
     expression.compile
-    assert_equal("mori daijiro", expression.execute)
+    expression.execute
+    assert_equal("mori daijiro", context.pop)
   end
 
   def test_get_value_with_variable
@@ -44,12 +46,52 @@ class ExpressionTest < Test::Unit::TestCase
     variable.value = morita
     expression.append_object(variable)
     expression.append_constant("name")
-    expression.append_operation(Groonga::Operation::OBJECT_GET_VALUE, 2)
+    expression.append_operation(Groonga::Operation::GET_VALUE, 2)
     expression.compile
-
-    assert_equal("mori daijiro", expression.execute)
+    expression.execute
+    assert_equal("mori daijiro", context.pop)
 
     variable.value = gunyara_kun.id
-    assert_equal("Tasuku SUENAGA", expression.execute)
+    expression.execute
+    assert_equal("Tasuku SUENAGA", context.pop)
+  end
+
+  def test_inspect
+    expression = Groonga::Expression.new
+    expression.append_constant(1)
+    expression.append_constant(1)
+    expression.append_operation(Groonga::Operation::PLUS, 2)
+    expression.compile
+
+    assert_equal("#<Groonga::Expression noname(){1 1}>", expression.inspect)
+  end
+
+  def test_snippet
+    users = Groonga::Array.create(:name => "users")
+    name = users.define_column("name", "ShortText")
+    terms = Groonga::Hash.create(:name => "terms",
+                                 :key_type => "ShortText",
+                                 :default_tokenizer => "TokenBigram")
+    users.define_index_column("user_name", users,
+                              :source => "users.name",
+                              :with_position => true)
+
+    expression = Groonga::Expression.new
+    variable = expression.define_variable(:domain => users)
+    expression.append_object(variable)
+    expression.parse("ラングバ OR Ruby OR groonga", :default_column => name)
+    expression.compile
+
+    snippet = expression.snippet([["[[", "]]"], ["<", ">"]],
+                                 :width => 30)
+    assert_equal(["[[ラングバ]]プロジェクト",
+                  "ン[[groonga]]の機能を<Ruby>か",
+                  "。[[groonga]]の機能を<Ruby>ら"],
+                 snippet.execute("ラングバプロジェクトはカラムストア機能も" +
+                                 "備える高速・高機能な全文検索エンジンgroonga" +
+                                 "の機能をRubyから利用するためのライブラリを" +
+                                 "提供するプロジェクトです。groongaの機能を" +
+                                 "Rubyらしい読み書きしやすい構文で利用できる" +
+                                 "ことが利点です。"))
   end
 end

data/test/test-hash.rb

@@ -203,4 +203,11 @@ class HashTest < Test::Unit::TestCase
     users.add("morita")
     assert_true(users.has_key?("morita"))
   end
+
+  def test_big_key
+    hash = Groonga::Hash.create(:key_type => "UInt64")
+    assert_nothing_raised do
+      hash.add(1 << 63)
+    end
+  end
 end

data/test/test-patricia-trie.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -88,4 +89,42 @@ class PatriciaTrieTest < Test::Unit::TestCase
     users.add("morita")
     assert_true(users.has_key?("morita"))
   end
+
+  def test_scan
+    Groonga::Context.default_options = {:encoding => "utf-8"}
+    words = Groonga::PatriciaTrie.create(:key_type => "ShortText",
+                                         :key_normalize => true)
+    words.add("リンク")
+    adventure_of_link = words.add('リンクの冒険')
+    words.add('冒険')
+    gaxtu = words.add('ｶﾞｯ')
+    muteki = words.add('ＭＵＴＥＫＩ')
+    assert_equal([[muteki, "muTEki", 0, 6],
+                  [adventure_of_link, "リンクの冒険", 7, 18],
+                  [gaxtu, "ガッ", 42, 6]],
+                 words.scan('muTEki リンクの冒険 ミリバール ガッ'))
+  end
+
+  def test_tag_keys
+    Groonga::Context.default_options = {:encoding => "utf-8"}
+    words = Groonga::PatriciaTrie.create(:key_type => "ShortText",
+                                         :key_normalize => true)
+    words.add("リンク")
+    words.add('リンクの冒険')
+    words.add('冒険')
+    words.add('㍊')
+    words.add('ｶﾞｯ')
+    words.add('ＭＵＴＥＫＩ')
+
+    text = 'muTEki リンクの冒険 マッチしない ミリバール ガッ'
+    actual = words.tag_keys(text) do |record, word|
+      "<#{word}(#{record.key})>"
+    end
+    assert_equal("<muTEki(muteki)> " +
+                 "<リンクの冒険(リンクの冒険)> " +
+                 "マッチしない " +
+                 "<ミリバール(ミリバール)> " +
+                 "<ガッ(ガッ)>",
+                 actual)
+  end
 end

data/test/test-record.rb

@@ -122,14 +122,14 @@ class RecordTest < Test::Unit::TestCase
 
   def test_get_nonexistent_column
     groonga = @bookmarks.add
-    assert_raise(Groonga::Error) do
+    assert_raise(Groonga::InvalidArgument) do
       groonga["nonexistent"]
     end
   end
 
   def test_set_nonexistent_column
     groonga = @bookmarks.add
-    assert_raise(Groonga::Error) do
+    assert_raise(Groonga::InvalidArgument) do
       groonga["nonexistent"] = "value"
     end
   end

data/test/test-remote.rb

@@ -0,0 +1,52 @@
+# Copyright (C) 2009  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
+
+class RemoteTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :before => :append
+  def setup_remote_connection
+    @process_id = nil
+
+    package_config = PKGConfig.package_config("groonga")
+    groonga = package_config.variable("groonga")
+
+    @host = "127.0.0.1"
+    @port = 12345
+    @remote_database_path = @tmp_dir + "remote-database"
+    @process_id = Process.fork do
+      exec(groonga,
+           "-i", @host,
+           "-p", @port.to_s,
+           "-s", "-n", @remote_database_path.to_s)
+    end
+    sleep(1)
+  end
+
+  teardown
+  def teardown_remote_connection
+    Process.kill(:TERM, @process_id) if @process_id
+  end
+
+  def test_send
+    _context = Groonga::Context.new
+    _context.connect(:host => @host, :port => @port)
+    assert_equal(0, _context.send("status"))
+    id, result = _context.receive
+    assert_equal(0, id)
+    assert_equal(["alloc_count", "starttime", "uptime"],
+                 JSON.load(result).keys.sort)
+  end
+end

data/test/test-schema.rb

@@ -125,7 +125,7 @@ class SchemaTest < Test::Unit::TestCase
                  "id: <#{table.id}>, " +
                  "name: <<posts>>, " +
                  "path: <#{path}>, " +
-                 "domain: <nil>, " +
+                 "domain: <#{type.inspect}>, " +
                  "range: <#{type.inspect}>, " +
                  "flags: <>, " +
                  "size: <0>>",

data/test/test-table-select-normalize.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009  SHIDARA Yoji <dara@shidara.net>
+#
+# 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
+
+class TableTestSelectNormalize < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
+
+  setup
+  def setup_comments
+    @comments = Groonga::Array.create(:name => "comments")
+    @comments.define_column("content", "Text")
+    @comments.define_column("created_at", "Time")
+    terms = Groonga::PatriciaTrie.create(:name => "terms",
+                                         :default_tokenizer => "TokenBigram",
+                                         :key_normalize => true)
+    terms.define_index_column("comment_content", @comments,
+                              :with_section => true,
+                              :source => "comments.content")
+    @japanese_comment =
+      @comments.add(:content => "うちのボロTVはまだ現役です",
+                    :created_at => Time.parse("2009-06-09"))
+  end
+
+  def test_select_query_with_japanese
+    result = @comments.select("content:%ボロTV")
+    assert_equal_select_result([@japanese_comment], result)
+  end
+
+  def test_select_query_only_in_japanese
+    result = @comments.select("content:%うちの")
+    assert_equal_select_result([@japanese_comment], result)
+  end
+end

data/test/test-table-select.rb

@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2009  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
+
+class TableTestSelect < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
+
+  setup
+  def setup_comments
+    @comments = Groonga::Array.create(:name => "comments")
+    @comments.define_column("content", "Text")
+    @comments.define_column("created_at", "Time")
+    terms = Groonga::PatriciaTrie.create(:name => "terms",
+                                         :default_tokenizer => "TokenBigram")
+    terms.define_index_column("comment_content", @comments,
+                              :with_section => true,
+                              :source => "comments.content")
+    @comment1 = @comments.add(:content => "Hello Good-bye!",
+                              :created_at => Time.parse("2009-08-09"))
+    @comment2 = @comments.add(:content => "Hello World",
+                              :created_at => Time.parse("2009-07-09"))
+    @comment3 = @comments.add(:content => "test",
+                              :created_at => Time.parse("2009-06-09"))
+    @japanese_comment =
+      @comments.add(:content => "うちのボロTVはまだ現役です",
+                    :created_at => Time.parse("2009-06-09"))
+  end
+
+  def test_select_sub_expression
+    result = @comments.select do |record|
+      record.match("Hello", "content") &
+        (record["created_at"] < Time.parse("2009-08-01"))
+    end
+    assert_equal_select_result([@comment2], result)
+  end
+
+  def test_select_query
+    result = @comments.select("content:%Hello")
+    assert_equal_select_result([@comment1, @comment2], result)
+  end
+
+  def test_select_query_with_block
+    result = @comments.select("content:%Hello") do |record|
+      record["created_at"] < Time.parse("2009-08-01")
+    end
+    assert_equal_select_result([@comment2], result)
+  end
+
+  def test_select_query_with_block_match
+    result = @comments.select("content:%Hello") do |record|
+      record.match("World", "content")
+    end
+    assert_equal_select_result([@comment2], result)
+  end
+
+  def test_select_without_block
+    assert_equal_select_result([@comment1, @comment2,
+                                @comment3, @japanese_comment],
+                               @comments.select)
+  end
+
+  def test_select_query_japanese
+    result = @comments.select("content:%ボロTV")
+    assert_equal_select_result([@japanese_comment], result)
+  end
+
+  def test_select_but_query
+    result = @comments.select do |record|
+      record["content"].match "Hello -World"
+    end
+    assert_equal_select_result([@comment1], result)
+  end
+
+  def test_select_query_with_three_terms
+    result = @comments.select do |record|
+      record["content"].match "Say Hello World"
+    end
+    assert_equal_select_result([], result)
+  end
+
+  def test_select_query_with_brackets
+    result = @comments.select do |record|
+      record["content"].match "Say (Hello World)"
+    end
+    assert_equal_select_result([], result)
+  end
+end