rroonga 1.0.1-x86-mingw32 → 1.1.0-x86-mingw32

data/example/bookmark.rb

@@ -27,7 +27,7 @@ path = ARGV[0]
 if path.nil?
   require 'tmpdir'
   require 'fileutils'
-  temporary_directory = File.join(Dir.tmpdir, "ruby-groonga")
+  temporary_directory = File.join(Dir.tmpdir, "rroonga")
   FileUtils.mkdir_p(temporary_directory)
   at_exit {FileUtils.rm_rf(temporary_directory)}
   path = File.join(temporary_directory, "db")
@@ -36,126 +36,129 @@ persistent = true
 
 p Groonga::Database.create(:path => path)
 
-p(items = Groonga::Hash.create(:name => "Items",
-                               :key_type => "ShortText",
-                               :persistent => persistent))
+p Groonga::Schema.create_table("Items", :type => :hash)
+p(items = Groonga["Items"])
+
+p items.size
 
 p items.add("http://ja.wikipedia.org/wiki/Ruby")
-p items.add("http://www.ruby-lang.org/")
+p items.add("http://www.ruby-lang.org/ja/")
+
+p items.size
+
+p items["http://ja.wikipedia.org/wiki/Ruby"]
 
-p items.define_column("title", "Text", :persistent => persistent)
+p(Groonga::Schema.change_table("Items") do |table|
+    table.text("title")
+  end)
+p(title_column = Groonga["Items.title"])
 
-p(terms = Groonga::Hash.create(:name => "Terms",
-                               :key_type => "ShortText",
-                               :persistent => persistent,
+p(Groonga::Schema.create_table("Terms",
+                               :type => :patricia_trie,
+                               :key_normalize => true,
                                :default_tokenizer => "TokenBigram"))
-p terms.define_index_column("item_title", items,
-                            :persistent => persistent,
-                            :with_weight => true,
-                            :with_section => true,
-                            :with_position => true,
-                            :source => "Items.title")
-
-p items.find("http://ja.wikipedia.org/wiki/Ruby")["title"] = "Ruby"
-p items.find("http://www.ruby-lang.org/")["title"] = "オブジェクト指向スクリプト言語Ruby"
-
-p(users = Groonga::Hash.create(:name => "Users",
-                               :key_type => "ShortText",
-                               :persistent => persistent))
-p users.define_column("name", "Text",
-                      :persistent => persistent)
-
-p(comments = Groonga::Array.create(:name => "Comments",
-                                   :persistent => persistent))
-p comments.define_column("item", items)
-p comments.define_column("author", users)
-p comments.define_column("content", "Text")
-p comments.define_column("issued", "Time")
-
-p terms.define_index_column("comment_content", comments,
-                            :persistent => persistent,
-                            :with_weight => true,
-                            :with_section => true,
-                            :with_position => true,
-                            :source => "Comments.content")
-
-p users.add("moritan", :name => "モリタン")
-p users.add("taporobo", :name => "タポロボ")
-
-
-p items.find("http://d.hatena.ne.jp/brazil/20050829/1125321936")
-
-p items.add("http://d.hatena.ne.jp/brazil/20050829/1125321936",
-            :title => "[翻訳]JavaScript: 世界で最も誤解されたプログラミング言語")
-
-p comments.add(:item => "http://d.hatena.ne.jp/brazil/20050829/1125321936",
+p(Groonga::Schema.change_table("Terms") do |table|
+    table.index("Items.title")
+  end)
+
+p(items["http://ja.wikipedia.org/wiki/Ruby"].title = "Ruby")
+p(items["http://www.ruby-lang.org/ja/"].title = "オブジェクトスクリプト言語Ruby")
+
+p(ruby_items = items.select {|record| record.title =~ "Ruby"})
+p(ruby_items.collect {|record| record.key.key})
+p(ruby_items.collect {|record| record["_key"]})
+
+p(Groonga::Schema.create_table("Users", :type => :hash) do |table|
+    table.text("name")
+  end)
+p(Groonga::Schema.create_table("Comments") do |table|
+    table.reference("item")
+    table.reference("author", "Users")
+    table.text("content")
+    table.time("issued")
+  end)
+
+p(Groonga::Schema.change_table("Terms") do |table|
+    table.index("Comments.content")
+  end)
+
+p(users = Groonga["Users"])
+p(users.add("moritan", :name => "モリタン"))
+p(users.add("taporobo", :name => "タポロボ"))
+
+p(items.has_key?("http://www.rubyist.net/~matz/"))
+p(items.add("http://www.rubyist.net/~matz/",
+            :title => "Matzにっき"))
+
+require "time"
+
+p(comments = Groonga["Comments"])
+p(comments.add(:item => "http://www.rubyist.net/~matz/",
                :author => "moritan",
-               :content => "JavaScript LISP",
-               :issued => 1187430026)
+               :content => "Ruby Matz",
+               :issued => Time.parse("2010-11-20T18:01:22+09:00")))
 
-@items = items
-@comments = comments
+p(@items = items)
+p(@comments = comments)
 def add_bookmark(url, title, author, content, issued)
-  item = @items.find(url) || @items.add(url, :title => title)
+  item = @items[url] || @items.add(url, :title => title)
   @comments.add(:item => item,
                 :author => author,
                 :content => content,
                 :issued => issued)
 end
 
-p add_bookmark("http://practical-scheme.net/docs/cont-j.html",
-               "なんでも継続", "moritan", "継続 LISP Scheme", 1187568692)
-p add_bookmark("http://d.hatena.ne.jp/higepon/20070815/1187192864",
-               "末尾再帰", "taporobo", "末尾再帰 Scheme LISP", 1187568793)
-p add_bookmark("http://practical-scheme.net/docs/cont-j.html",
-               "なんでも継続", "taporobo", "トランポリン LISP continuation",
-               1187568692.98765)
-p add_bookmark("http://jp.rubyist.net/managinze",
-               "るびま", "moritan", "Ruby ドキュメント",
-               Time.now)
-p add_bookmark("http://jp.rubyist.net/managinze",
-               "るびま", "taporobo", "Ruby 雑誌",
-               Time.now)
-p add_bookmark("http://groonga.rubyforge.org/",
-               "ラングバ", "moritan", "Ruby groonga",
-               Time.parse("2009-07-19"))
-
-
-records = comments.select do |record|
-  record["content"] =~ "LISP"
-end
+p(add_bookmark("http://jp.rubyist.net/magazine/",
+               "Rubyist Magazine - るびま", "moritan", "Ruby 記事",
+               Time.parse("2010-10-07T14:18:28+09:00")))
+p(add_bookmark("http://groonga.rubyforge.org/",
+               "Rubyでgroonga使って全文検索 - ラングバ", "taporobo",
+               "Ruby groonga 全文検索",
+               Time.parse("2010-11-11T12:39:59+09:00")))
+p(add_bookmark("http://www.rubyist.net/~matz/",
+               "Matz日記", "taporobo", "Ruby 日記",
+               Time.parse("2010-07-28T20:46:23+09:00")))
+
+p(records = comments.select do |record|
+    record["content"] =~ "Ruby"
+  end)
 
 records.each do |record|
   record = record.key
   p [record.id,
-     record[".issued"],
-     record[".item.title"],
-     record[".author.name"],
-     record[".content"]]
+     record.issued,
+     record.item.title,
+     record.author.name,
+     record.content]
 end
 
 p records
 
-records.sort([{:key => ".issued", :order => "descending"}]).each do |record|
+records.sort([{:key => "issued", :order => "descending"}]).each do |record|
   record = record.key
   p [record.id,
-     record[".issued"],
-     record[".item.title"],
-     record[".author.name"],
-     record[".content"]]
+     record.issued,
+     record.item.title,
+     record.author.name,
+     record.content]
 end
 
 records.group("item").each do |record|
   item = record.key
   p [record.n_sub_records,
      item.key,
-     item[".title"]]
+     item.title]
 end
 
-p ruby_comments = @comments.select {|record| record["content"] =~ "Ruby"}
-p ruby_items = @items.select("*W1:50 title:@Ruby")
-
-p ruby_items = ruby_comments.group(".item").union!(ruby_items)
-ruby_items.sort([{:key => "._score", :order => "descending"}]).each do |record|
-  p [record["._score"], record[".title"]]
+p(ruby_comments = @comments.select {|record| record.content =~ "Ruby"})
+p(ruby_items = @items.select do |record|
+    target = record.match_target do |match_record|
+      match_record.title * 10
+    end
+    target =~ "Ruby"
+  end)
+
+p(ruby_items = ruby_comments.group("item").union!(ruby_items))
+ruby_items.sort([{:key => "_score", :order => "descending"}]).each do |record|
+  p [record.score, record.title]
 end

data/ext/groonga/extconf.rb

@@ -15,14 +15,9 @@
 # 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 'pathname'
-
-base_dir = Pathname(__FILE__).dirname.parent.parent
-$LOAD_PATH.unshift(base_dir.to_s)
-
 require 'English'
+require 'pathname'
 require 'mkmf'
-require 'rroonga-build'
 
 begin
   require 'pkg-config'
@@ -31,6 +26,11 @@ rescue LoadError
   require 'pkg-config'
 end
 
+base_dir = Pathname(__FILE__).dirname.parent.parent
+$LOAD_PATH.unshift(base_dir.to_s)
+
+require 'rroonga-build'
+
 include RroongaBuild
 
 package_name = "groonga"

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

@@ -34,7 +34,7 @@ rb_grn_accessor_from_ruby_object (VALUE object)
 
 VALUE
 rb_grn_accessor_to_ruby_object (grn_ctx *context, grn_obj *table,
-				rb_grn_boolean owner)
+				grn_bool owner)
 {
     return GRNOBJECT2RVAL(rb_cGrnAccessor, context, table, owner);
 }

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

@@ -139,7 +139,7 @@ rb_grn_array_s_create (int argc, VALUE *argv, VALUE klass)
 			     flags, NULL, value_type);
     if (!table)
 	rb_grn_context_check(context, rb_ary_new4(argc, argv));
-    rb_table = GRNOBJECT2RVAL(klass, context, table, RB_GRN_TRUE);
+    rb_table = GRNOBJECT2RVAL(klass, context, table, GRN_TRUE);
     rb_grn_context_check(context, rb_table);
     rb_iv_set(rb_table, "@context", rb_context);
 

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

@@ -1,7 +1,7 @@
 /* -*- c-file-style: "ruby" -*- */
 /* vim: set sts=4 sw=4 ts=8 noet: */
 /*
-  Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2011  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
@@ -60,7 +60,7 @@ rb_grn_column_from_ruby_object (VALUE object, grn_ctx **context)
 
 VALUE
 rb_grn_column_to_ruby_object (VALUE klass, grn_ctx *context, grn_obj *column,
-			      rb_grn_boolean owner)
+			      grn_bool owner)
 {
     return GRNOBJECT2RVAL(klass, context, column, owner);
 }
@@ -128,7 +128,7 @@ rb_grn_column_get_table (VALUE self)
     table = grn_column_table(context, column);
     rb_grn_context_check(context, self);
 
-    return GRNOBJECT2RVAL(Qnil, context, table, RB_GRN_FALSE);
+    return GRNOBJECT2RVAL(Qnil, context, table, GRN_FALSE);
 }
 
 /*
@@ -235,17 +235,17 @@ rb_grn_column_get_local_name (VALUE self)
  *
  * [+:operator+]
  *   マッチしたレコードをどのように扱うか。指定可能な値は以
- *   下の通り。省略した場合はGroonga::Operation::OR。
+ *   下の通り。省略した場合はGroonga::Operator::OR。
  *
- *   [Groonga::Operation::OR]
+ *   [Groonga::Operator::OR]
  *     マッチしたレコードを追加。すでにレコードが追加され
  *     ている場合は何もしない。
- *   [Groonga::Operation::AND]
+ *   [Groonga::Operator::AND]
  *     マッチしたレコードのスコアを増加。マッチしなかった
  *     レコードを削除。
- *   [Groonga::Operation::BUT]
+ *   [Groonga::Operator::BUT]
  *     マッチしたレコードを削除。
- *   [Groonga::Operation::ADJUST]
+ *   [Groonga::Operator::ADJUST]
  *     マッチしたレコードのスコアを増加。
  *
  * [+:result+]
@@ -333,7 +333,7 @@ rb_grn_column_select (int argc, VALUE *argv, VALUE self)
 				  GRN_TABLE_HASH_KEY | GRN_OBJ_WITH_SUBREC,
 				  table,
 				  0);
-	rb_result = GRNTABLE2RVAL(context, result, RB_GRN_TRUE);
+	rb_result = GRNTABLE2RVAL(context, result, GRN_TRUE);
     } else {
 	result = RVAL2GRNTABLE(rb_result, &context);
     }
@@ -355,7 +355,7 @@ rb_grn_column_select (int argc, VALUE *argv, VALUE self)
 
     rb_attr(rb_singleton_class(rb_result),
 	    rb_intern("expression"),
-	    RB_GRN_TRUE, RB_GRN_FALSE, RB_GRN_FALSE);
+	    GRN_TRUE, GRN_FALSE, GRN_FALSE);
     rb_iv_set(rb_result, "@expression", rb_expression);
 
     return rb_result;
@@ -552,6 +552,187 @@ rb_grn_column_is_locked (int argc, VALUE *argv, VALUE self)
     return CBOOL2RVAL(grn_obj_is_locked(context, column));
 }
 
+/*
+ * Document-method: reference?
+ *
+ * call-seq:
+ *   column.reference? -> true/false
+ *
+ * _column_の値がテーブルのレコードとなる場合は+true+を返し、
+ * そうでない場合は+false+を返す。
+ *
+ * @since: 1.0.5
+ */
+static VALUE
+rb_grn_column_reference_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *column;
+    grn_id range_id;
+    grn_obj *range;
+    unsigned short int type;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+			     NULL, NULL,
+			     NULL, NULL, NULL);
+
+    range_id = grn_obj_get_range(context, column);
+    range = grn_ctx_at(context, range_id);
+    type = range->header.type;
+    grn_obj_unlink(context, range);
+    switch (type) {
+      case GRN_TABLE_HASH_KEY:
+      case GRN_TABLE_PAT_KEY:
+      case GRN_TABLE_NO_KEY:
+	return Qtrue;
+      default:
+	return Qfalse;
+    }
+}
+
+/*
+ * Document-method: index?
+ *
+ * call-seq:
+ *   column.index? -> true/false
+ *
+ * _column_がGroonga::IndexColumnの場合は+true+を返し、
+ * そうでない場合は+false+を返す。
+ *
+ * @since: 1.0.5
+ */
+static VALUE
+rb_grn_column_index_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *column;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+			     NULL, NULL,
+			     NULL, NULL, NULL);
+
+    if (column->header.type == GRN_COLUMN_INDEX) {
+	return Qtrue;
+    } else {
+	return Qfalse;
+    }
+}
+
+/*
+ * Document-method: vector?
+ *
+ * call-seq:
+ *   column.vector? -> true/false
+ *
+ * _column_がベクターカラムの場合は+true+を返し、
+ * そうでない場合は+false+を返す。
+ *
+ * @since: 1.0.5
+ */
+static VALUE
+rb_grn_column_vector_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *column;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+			     NULL, NULL,
+			     NULL, NULL, NULL);
+
+    if (column->header.type == GRN_COLUMN_VAR_SIZE &&
+	((column->header.flags & GRN_OBJ_COLUMN_TYPE_MASK) ==
+	 GRN_OBJ_COLUMN_VECTOR)) {
+	return Qtrue;
+    } else {
+	return Qfalse;
+    }
+}
+
+/*
+ * Document-method: scalar?
+ *
+ * call-seq:
+ *   column.scalar? -> true/false
+ *
+ * _column_がスカラーカラムの場合は+true+を返し、
+ * そうでない場合は+false+を返す。
+ *
+ * @since: 1.0.5
+ */
+static VALUE
+rb_grn_column_scalar_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *column;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+			     NULL, NULL,
+			     NULL, NULL, NULL);
+
+    switch (column->header.type) {
+      case GRN_COLUMN_FIX_SIZE:
+	return Qtrue;
+      case GRN_COLUMN_VAR_SIZE:
+	if ((column->header.flags & GRN_OBJ_COLUMN_TYPE_MASK) ==
+	    GRN_OBJ_COLUMN_SCALAR) {
+	    return Qtrue;
+	} else {
+	    return Qfalse;
+	}
+      default:
+	return Qfalse;
+    }
+}
+
+/*
+ * Document-method: indexes
+ *
+ * call-seq:
+ *   column.indexes(operator=Groonga::Operator::MATCH) -> [index_column, ...]
+ *
+ * _operation_を実行できる_column_のインデックスを返す。
+ *
+ * @since: 1.0.9
+ */
+static VALUE
+rb_grn_column_get_indexes (int argc, VALUE *argv, VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *column;
+    grn_obj **indexes = NULL;
+    int i, n_indexes;
+    grn_operator operator = GRN_OP_MATCH;
+    VALUE rb_operator, rb_indexes;
+
+    rb_scan_args(argc, argv, "01", &rb_operator);
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+			     NULL, NULL,
+			     NULL, NULL, NULL);
+
+    if (!NIL_P(rb_operator)) {
+	operator = RVAL2GRNOPERATOR(rb_operator);
+    }
+
+    rb_indexes = rb_ary_new();
+    n_indexes = grn_column_index(context, column, operator,
+				 NULL, 0, NULL);
+    if (n_indexes == 0)
+	return rb_indexes;
+
+    indexes = xmalloc(sizeof(grn_obj *) * n_indexes);
+    n_indexes = grn_column_index(context, column, operator,
+				 indexes, n_indexes, NULL);
+    for (i = 0; i < n_indexes; i++) {
+	VALUE rb_index;
+	rb_index = GRNOBJECT2RVAL(Qnil, context, indexes[i], GRN_FALSE);
+	rb_ary_push(rb_indexes, rb_index);
+	grn_obj_unlink(context, indexes[i]);
+    }
+    xfree(indexes);
+    return rb_indexes;
+}
+
 void
 rb_grn_init_column (VALUE mGrn)
 {
@@ -566,6 +747,16 @@ rb_grn_init_column (VALUE mGrn)
     rb_define_method(rb_cGrnColumn, "unlock", rb_grn_column_unlock, -1);
     rb_define_method(rb_cGrnColumn, "clear_lock", rb_grn_column_clear_lock, -1);
     rb_define_method(rb_cGrnColumn, "locked?", rb_grn_column_is_locked, -1);
+    rb_define_method(rb_cGrnColumn, "reference?", rb_grn_column_reference_p, 0);
+    /* deprecated: backward compatibility */
+    rb_define_alias(rb_cGrnColumn, "reference_column?", "reference?");
+    rb_define_method(rb_cGrnColumn, "index?", rb_grn_column_index_p, 0);
+    /* deprecated: backward compatibility */
+    rb_define_alias(rb_cGrnColumn, "index_column?", "index?");
+    rb_define_method(rb_cGrnColumn, "vector?", rb_grn_column_vector_p, 0);
+    rb_define_method(rb_cGrnColumn, "scalar?", rb_grn_column_scalar_p, 0);
+
+    rb_define_method(rb_cGrnColumn, "indexes", rb_grn_column_get_indexes, -1);
 
     rb_grn_init_fix_size_column(mGrn);
     rb_grn_init_variable_size_column(mGrn);