rroonga 0.9.5-x86-mingw32 → 1.0.1-x86-mingw32

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

@@ -686,8 +686,8 @@ rb_grn_table_open_grn_cursor (int argc, VALUE *argv, VALUE self,
     unsigned min_key_size = 0, max_key_size = 0;
     int offset = 0, limit = -1;
     int flags = 0;
-    VALUE options, rb_min, rb_max, rb_order, rb_greater_than, rb_less_than;
-    VALUE rb_offset, rb_limit;
+    VALUE options, rb_min, rb_max, rb_order, rb_order_by;
+    VALUE rb_greater_than, rb_less_than, rb_offset, rb_limit;
 
     rb_grn_table_deconstruct(SELF(self), &table, context,
 			     NULL, NULL,
@@ -702,6 +702,7 @@ rb_grn_table_open_grn_cursor (int argc, VALUE *argv, VALUE self,
                         "offset", &rb_offset,
                         "limit", &rb_limit,
 			"order", &rb_order,
+			"order_by", &rb_order_by,
 			"greater_than", &rb_greater_than,
 			"less_than", &rb_less_than,
 			NULL);
@@ -732,6 +733,28 @@ rb_grn_table_open_grn_cursor (int argc, VALUE *argv, VALUE self,
 		 "[:asc, :ascending, :desc, :descending]: %s",
 		 rb_grn_inspect(rb_order));
     }
+    if (NIL_P(rb_order_by)) {
+	if (table->header.type == GRN_TABLE_PAT_KEY) {
+	    flags |= GRN_CURSOR_BY_KEY;
+	} else {
+	    flags |= GRN_CURSOR_BY_ID;
+	}
+    } else if (rb_grn_equal_option(rb_order_by, "id")) {
+	flags |= GRN_CURSOR_BY_ID;
+    } else if (rb_grn_equal_option(rb_order_by, "key")) {
+	if (table->header.type != GRN_TABLE_PAT_KEY) {
+	    rb_raise(rb_eArgError,
+		     "order_by => :key is available "
+		     "only for Groonga::PatriciaTrie: %s",
+		     rb_grn_inspect(self));
+	}
+	flags |= GRN_CURSOR_BY_KEY;
+    } else {
+	rb_raise(rb_eArgError,
+		 "order_by should be one of [:id%s]: %s",
+		 table->header.type == GRN_TABLE_PAT_KEY ? ", :key" : "",
+		 rb_grn_inspect(rb_order_by));
+    }
 
     if (RVAL2CBOOL(rb_greater_than))
 	flags |= GRN_CURSOR_GT;
@@ -779,6 +802,14 @@ rb_grn_table_open_grn_cursor (int argc, VALUE *argv, VALUE self,
  *   +:desc+または+:descending+を指定すると降順にレコードを
  *   取り出す。
  *
+ * [+:order_by+]
+ *   +:id+を指定するとID順にレコードを取り出す。（Arrayと
+ *   Hashのデフォルト）
+ *
+ *   +:key+指定するとキー順にレコードを取り出す。ただし、
+ *   Groonga::PatriciaTrieにしか使えない。（PatriciaTrieのデ
+ *   フォルト）
+ *
  * [+:greater_than+]
  *   +true+を指定すると+:min+で指定した値に一致した[+key+]を
  *   範囲に含まない。

data/ext/groonga/rb-grn.h

@@ -67,9 +67,9 @@ RB_GRN_BEGIN_DECLS
 #  define debug(...)
 #endif
 
-#define RB_GRN_MAJOR_VERSION 0
-#define RB_GRN_MINOR_VERSION 9
-#define RB_GRN_MICRO_VERSION 5
+#define RB_GRN_MAJOR_VERSION 1
+#define RB_GRN_MINOR_VERSION 0
+#define RB_GRN_MICRO_VERSION 2
 
 typedef int rb_grn_boolean;
 #define RB_GRN_FALSE (0)

data/html/index.html

@@ -42,7 +42,7 @@
 
 	<h3>rroongaの最新リリース</h3>
 	<p>
-	  2010-07-29にリリースされた0.9.5が最新です。
+	  2010-09-12にリリースされた1.0.1が最新です。
         </p>
 
 	<h3 id="install-rroonga">rroongaのインストール</h3>

data/lib/groonga/record.rb

@@ -44,13 +44,31 @@ module Groonga
     # call-seq:
     #   record == other -> true/false
     #
-    # _record_と_other_が同じgroongaのレコードなら+true+を返し、
-    # そうでなければ+false+を返す。
+    # _record_と_other_が同じテーブルに属していて、さらに、
+    # 同じレコードIDを持つなら+true+を返し、そうでなければ
+    # +false+を返す。
     def ==(other)
       self.class == other.class and
         [table, id] == [other.table, other.id]
     end
 
+    # call-seq:
+    #   record.eql?(other) -> true/false
+    #
+    # Groonga::Record#==と同じ。
+    def eql?(other)
+      self == other
+    end
+
+    # call-seq:
+    #   record.hash -> ハッシュ値
+    #
+    # 同じテーブルの同じIDのレコードに対しては常に同じハッシュ
+    # 値を返す。
+    def hash
+      @table.hash ^ @id.hash
+    end
+
     # call-seq:
     #   record[column_name] -> 値
     #
@@ -144,10 +162,22 @@ module Groonga
     #
     # 主キーの値が同一であったレコードの件数を返す。検索結果とし
     # て生成されたテーブルのみに定義される。
+    #
+    # Groonga::Record#support_sub_recordsでこの値を利用でき
+    # るかがわかる。
     def n_sub_records
       self["._nsubrecs"]
     end
 
+    # call-seq:
+    #   record.support_sub_records? -> true/false
+    #
+    # Groonga::Record#n_sub_recordsが利用できる場合はtrueを
+    # 返す。
+    def support_sub_records?
+      @table.support_sub_records?
+    end
+
     # call-seq:
     #   record.value -> 値
     #

data/lib/groonga/schema.rb

@@ -1212,7 +1212,7 @@ module Groonga
         # TODO: should check column type and other options.
         return false if index.range.name != @target_table
         source_names = index.sources.collect do |source|
-          if source.nil?
+          if source == index
             "#{index.range.name}._key"
           else
             source.name

data/rroonga-build.rb

@@ -17,9 +17,9 @@
 
 module RroongaBuild
   module RequiredGroongaVersion
-    MAJOR = 0
-    MINOR = 7
-    MICRO = 4
+    MAJOR = 1
+    MINOR = 0
+    MICRO = 0
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-patricia-trie.rb

@@ -57,7 +57,7 @@ class PatriciaTrieTest < Test::Unit::TestCase
 
   def test_add
     users = Groonga::PatriciaTrie.create(:name => "Users")
-    users.define_column("address", "<text>")
+    users.define_column("address", "Text")
     me = users.add("me", :address => "me@example.com")
     assert_equal("me@example.com", me[:address])
   end
@@ -202,4 +202,175 @@ class PatriciaTrieTest < Test::Unit::TestCase
     assert_equal([],
                  records.records.collect {|record| record["._key"]})
   end
+
+
+  def test_prefix_cursor
+    paths = Groonga::PatriciaTrie.create(:name => "Paths",
+                                         :key_type => 'ShortText')
+    root_path = paths.add('/')
+    tmp_path = paths.add('/tmp')
+    usr_bin_path = paths.add('/usr/bin')
+    usr_local_bin_path = paths.add('/usr/local/bin')
+
+    assert_prefix_cursor(["/usr/local/bin", "/usr/bin", "/tmp", "/"],
+                         paths, "/", {:order => :desc})
+    assert_prefix_cursor(["/", "/tmp", "/usr/bin", "/usr/local/bin"],
+                         paths, "/")
+    assert_prefix_cursor(["/usr/local/bin", "/usr/bin"],
+                         paths, "/usr/local",
+                         {:key_bytes => "/usr".size, :order => :desc})
+    assert_prefix_cursor(["/tmp", "/usr/bin"],
+                         paths, "/",
+                         {:offset => 1, :limit => 2})
+  end
+
+  def assert_prefix_cursor(expected, tables, prefix, options={})
+    actual = []
+    tables.open_prefix_cursor(prefix, options) do |cursor|
+      cursor.each do |record|
+        actual << record.key
+      end
+    end
+    assert_equal(expected, actual)
+  end
+
+  def test_rk_cursor
+    terms = Groonga::PatriciaTrie.create(:name => "Terms",
+                                         :key_type => 'ShortText')
+    ["インデックス",
+     "エヌグラム",
+     "エンジン",
+     "カネソナエタ",
+     "カノウ",
+     "キノウ",
+     "キョウカ",
+     "クミコミ",
+     "クミコム",
+     "グルンガ",
+     "ケンサク",
+     "ケンサクヨウキュウ",
+     "ゲンゴ",
+     "コウセイド",
+     "コウソク",
+     "コンパクト",
+     "サクセイ",
+     "ショリ",
+     "ショリケイ",
+     "ジッソウ",
+     "ジュンスイ",
+     "スクリプト",
+     "セッケイ",
+     "ゼンブン",
+     "タイプ",
+     "タンゴ",
+     "ダイキボ",
+     "テンチ",
+     "ディービーエムエス",
+     "トウ",
+     "トクチョウ",
+     "ブンショリョウ",
+     "ヨウキュウ"].each do |term|
+      terms.add(term)
+    end
+
+    assert_rk_cursor(["カネソナエタ",
+                      "カノウ",
+                      "キノウ",
+                      "キョウカ",
+                      "クミコミ",
+                      "クミコム",
+                      "ケンサク",
+                      "ケンサクヨウキュウ",
+                      "コウセイド",
+                      "コウソク",
+                      "コンパクト"],
+                     terms, "k")
+  end
+
+  def assert_rk_cursor(expected, tables, prefix, options={})
+    actual = []
+    tables.open_rk_cursor(prefix, options) do |cursor|
+      cursor.each do |record|
+        actual << record.key
+      end
+    end
+    assert_equal(expected, actual.sort)
+  end
+
+  def test_near_cursor
+    points = Groonga::PatriciaTrie.create(:name => "Points",
+                                          :key_type => 'WGS84GeoPoint')
+    ["130322053x504985073",
+     "130285021x504715091",
+     "130117012x504390088",
+     "130335016x504662007",
+     "130308044x504536008",
+     "130306053x504530043",
+     "130205016x505331054",
+     "130222054x505270050",
+     "130255017x504266011",
+     "130239038x504251015",
+     "129885039x503653023",
+     "129809022x504597055",
+     "130015001x504266057",
+     "130089012x505045070",
+     "130208017x504315098",
+     "130347036x504325073",
+     "130380061x505202034",
+     "129903045x504648034",
+     "130094061x505025099",
+     "130133052x505120058",
+     "130329069x505188046",
+     "130226001x503769013",
+     "129866001x504328017",
+     "129786048x504792049",
+     "129845056x504853081",
+     "130055008x504968095",
+     "130086003x504480071",
+     "129680021x504441006",
+     "129855010x504452003",
+     "130280013x505208029",
+     "129721099x504685024",
+     "129690039x504418033",
+     "130019020x505027021",
+     "130046026x505082073",
+     "130038025x505066028",
+     "129917001x504675017"].each do |point|
+      points.add(point)
+    end
+
+    assert_near_cursor(["129680021x504441006",
+                        "129690039x504418033",
+                        "129721099x504685024",
+                        "129786048x504792049",
+                        "129809022x504597055",
+                        "129845056x504853081",
+                        "129855010x504452003",
+                        "129866001x504328017",
+                        "129885039x503653023",
+                        "129903045x504648034"],
+                       points,
+                       "129786048x504792049",
+                       {:limit => 10})
+  end
+
+  def assert_near_cursor(expected, tables, prefix, options={})
+    actual = []
+    tables.open_near_cursor(prefix, options) do |cursor|
+      cursor.each do |record|
+        actual << record.key
+      end
+    end
+    assert_equal(expected, actual)
+  end
+
+  def test_add_uint_key
+    numbers = Groonga::PatriciaTrie.create(:name => "Numbers",
+                                           :key_type => "UInt32")
+    numbers.add(1)
+    numbers.add(2)
+    numbers.add(5)
+    numbers.add(7)
+    assert_equal([1, 2, 5, 7], numbers.collect {|number| number.key})
+  end
 end

data/test/test-record.rb

@@ -268,4 +268,11 @@ class RecordTest < Test::Unit::TestCase
     groonga = @bookmarks.add(:user => morita, :uri => "http://groonga.org")
     assert_equal("morita", groonga.user.key)
   end
+
+  def test_support_sub_records
+    morita = @users.add("morita")
+    assert_not_predicate(morita, :support_sub_records?)
+    users = @users.select {|record| record.key == "morita"}
+    assert_predicate(users.to_a[0], :support_sub_records?)
+  end
 end

data/test/test-remote.rb

@@ -47,7 +47,8 @@ class RemoteTest < Test::Unit::TestCase
     id, result = _context.receive
     assert_equal(0, id)
     values = JSON.load(result)
-    assert_equal(["alloc_count", "starttime", "uptime", "version"],
+    assert_equal(["alloc_count", "cache_hit_rate", "n_queries",
+                  "starttime", "uptime", "version"],
                  values.keys.sort)
   end
 

data/test/test-table-cursor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2010  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
@@ -136,6 +136,40 @@ class TableCursorTest < Test::Unit::TestCase
     end
   end
 
+  def test_order_by_id
+    sites = Groonga::PatriciaTrie.create(:name => "Sites")
+    sites.add("http://qwik.jp/senna/")
+    sites.add("http://www.ruby-lang.org/")
+    sites.add("http://groonga.org/")
+    keys = []
+    sites.open_cursor(:order_by => :id) do |cursor|
+      while cursor.next
+        keys << cursor.key
+      end
+    end
+    assert_equal(["http://qwik.jp/senna/",
+                  "http://www.ruby-lang.org/",
+                  "http://groonga.org/"],
+                 keys)
+  end
+
+  def test_order_by_key
+    sites = Groonga::PatriciaTrie.create(:name => "Sites")
+    sites.add("http://www.ruby-lang.org/")
+    sites.add("http://qwik.jp/senna/")
+    sites.add("http://groonga.org/")
+    keys = []
+    sites.open_cursor(:order_by => :key) do |cursor|
+      while cursor.next
+        keys << cursor.key
+      end
+    end
+    assert_equal(["http://groonga.org/",
+                  "http://qwik.jp/senna/",
+                  "http://www.ruby-lang.org/"],
+                 keys)
+  end
+
   private
   def create_users
     users = Groonga::Array.create(:name => "Users")

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

@@ -25,11 +25,15 @@ class TableSelectNormalizeTest < Test::Unit::TestCase
     @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)
+    options = {
+      :name => "Terms",
+      :default_tokenizer => "TokenBigramSplitSymbol",
+      :key_normalize => true,
+    }
+    terms = Groonga::PatriciaTrie.create(options)
     terms.define_index_column("comment_content", @comments,
                               :with_section => true,
+                              :with_position => true,
                               :source => "Comments.content")
     @japanese_comment =
       @comments.add(:content => "うちのボロTV（アナログ...）はまだ現役です",