rroonga 0.9.4 → 0.9.5

data/NEWS.ja.rdoc

@@ -1,5 +1,34 @@
 = お知らせ
 
+== 0.9.5: 2010-07-29
+
+* groonga 0.7.4対応。
+* Groonga::Table#selectの改良:
+  * 重み付きマッチ対応:
+
+    sourceカラムとtitleカラムにマッチするが、
+    titleカラムの方がスコアが大きくなる例:
+      table.select do |record|
+        (record.title * 10 | record.source) =~ "query"
+      end
+  * 配列で複数条件のand表現に対応:
+
+    以下は同じ条件になる:
+      table.select do |record|
+        conditions = []
+        conditions << record.title =~ "query"
+        conditions << record.updated_at > Time.parse("2010-07-29T21:14:29+09:00")
+        conditions
+      end
+
+      table.select do |record|
+        (record.title =~ "query") &
+          (record.updated_at > Time.parse("2010-07-29T21:14:29+09:00"))
+      end
+* 利用しているgroongaのバージョン取得対応: Groonga::VERSION
+* Groonga::Table#support_sub_records?追加
+* ページネーション対応: Groonga::Table#paginate, Groonga::Pagination
+
 == 0.9.4: 2010-04-22
 
 * リリースミス修正。

data/NEWS.rdoc

@@ -1,5 +1,34 @@
 = NEWS
 
+== 0.9.5: 2010-07-20
+
+* Supported groonga 0.7.4.
+* Imporoved Groonga::Table#select:
+  * Supported weight match:
+
+    Here is an example to match source column or title column and
+    title column has high score:
+      table.select do |record|
+        (record.title * 10 | record.source) =~ "query"
+      end
+  * Supported and representation for and conditions:
+
+    Here are examples that represents the same condition:
+      table.select do |record|
+        conditions = []
+        conditions << record.title =~ "query"
+        conditions << record.updated_at > Time.parse("2010-07-29T21:14:29+09:00")
+        conditions
+      end
+
+      table.select do |record|
+        (record.title =~ "query") &
+          (record.updated_at > Time.parse("2010-07-29T21:14:29+09:00"))
+      end
+* Provided groonga runtime version: Groonga::VERSION
+* Added Groonga::Table#support_sub_records?
+* Supported pagination: Groonga::Table#paginate, Groonga::Pagination
+
 == 0.9.4: 2010-04-22
 
 * Fixed release miss.

data/Rakefile

@@ -87,10 +87,10 @@ end
 ENV["VERSION"] ||= guess_version
 version = ENV["VERSION"]
 project = nil
-Hoe.spec('rroonga') do |_project|
+Hoe.spec('rroonga') do
   Hoe::Test::SUPPORTED_TEST_FRAMEWORKS[:testunit2] = "test/run-test.rb"
-  project = _project
-  project.version = version
+  project = self
+  project.version = version.dup
   project.rubyforge_name = 'groonga'
   authors = File.join(base_dir, "AUTHORS")
   project.author = File.readlines(authors).collect do |line|
@@ -187,6 +187,7 @@ task :prepare_docs_for_publishing do
   end
 end
 
+desc "Publish HTML to Web site."
 task :publish_html do
   config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
   host = "#{config["username"]}@rubyforge.org"
@@ -196,6 +197,7 @@ task :publish_html do
   sh "rsync #{rsync_args} html/ #{host}:#{remote_dir}"
 end
 
+desc "Tag the current revision."
 task :tag do
   sh("git tag -a #{version} -m 'release #{version}!!!'")
 end

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

@@ -83,7 +83,7 @@ VALUE rb_cGrnArray;
  *
  * 名前付き永続テーブルを生成する。ただし、ファイル名は気に
  * しない。
- *   Groonga::Array.create(:name => "<bookmarks>",
+ *   Groonga::Array.create(:name => "Bookmarks",
  *                         :persistent => true)
  *
  * それぞれのレコードに512バイトの値を格納できる無名一時テー

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 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
@@ -107,19 +107,23 @@ rb_grn_context_to_exception (grn_ctx *context, VALUE related_object)
 
     GRN_OBJ_INIT(&bulk, GRN_BULK, 0, GRN_ID_NIL);
     GRN_TEXT_PUTS(context, &bulk, message);
-    GRN_TEXT_PUTS(context, &bulk, ": ");
-    GRN_TEXT_PUTS(context, &bulk, context->errbuf);
+    if (context->errbuf[0]) {
+        GRN_TEXT_PUTS(context, &bulk, ": ");
+        GRN_TEXT_PUTS(context, &bulk, context->errbuf);
+    }
     if (!NIL_P(related_object)) {
 	GRN_TEXT_PUTS(context, &bulk, ": ");
 	GRN_TEXT_PUTS(context, &bulk, rb_grn_inspect(related_object));
     }
-    GRN_TEXT_PUTS(context, &bulk, "\n");
-    GRN_TEXT_PUTS(context, &bulk, context->errfile);
-    GRN_TEXT_PUTS(context, &bulk, ":");
-    grn_text_itoa(context, &bulk, context->errline);
-    GRN_TEXT_PUTS(context, &bulk, ": ");
-    GRN_TEXT_PUTS(context, &bulk, context->errfunc);
-    GRN_TEXT_PUTS(context, &bulk, "()");
+    if (context->errline > 0) {
+        GRN_TEXT_PUTS(context, &bulk, "\n");
+        GRN_TEXT_PUTS(context, &bulk, context->errfile);
+        GRN_TEXT_PUTS(context, &bulk, ":");
+        grn_text_itoa(context, &bulk, context->errline);
+        GRN_TEXT_PUTS(context, &bulk, ": ");
+        GRN_TEXT_PUTS(context, &bulk, context->errfunc);
+        GRN_TEXT_PUTS(context, &bulk, "()");
+    }
     exception = rb_funcall(exception_class, rb_intern("new"), 1,
 			   rb_str_new(GRN_BULK_HEAD(&bulk),
 				      GRN_BULK_VSIZE(&bulk)));
@@ -410,7 +414,7 @@ static VALUE
 rb_grn_context_connect (int argc, VALUE *argv, VALUE self)
 {
     grn_ctx *context;
-    char *host;
+    const char *host;
     int port;
     int flags = 0;
     grn_rc rc;
@@ -610,21 +614,6 @@ rb_grn_context_array_reference (VALUE self, VALUE name_or_id)
     return GRNOBJECT2RVAL(Qnil, context, object, RB_GRN_FALSE);
 }
 
-/*
- * call-seq:
- *   context.pop -> 値
- *
- * コンテキスト内にあるスタックから値を取り出す。このスタッ
- * クにはGroonga::Expression#executeの実行結果が格納される。
- */
-static VALUE
-rb_grn_context_pop (VALUE self)
-{
-    grn_ctx *context;
-    context = SELF(self);
-    return GRNOBJ2RVAL(Qnil, context, grn_ctx_pop(context), self);
-}
-
 void
 rb_grn_init_context (VALUE mGrn)
 {
@@ -654,8 +643,6 @@ rb_grn_init_context (VALUE mGrn)
 
     rb_define_method(cGrnContext, "[]", rb_grn_context_array_reference, 1);
 
-    rb_define_method(cGrnContext, "pop", rb_grn_context_pop, 0);
-
     rb_define_method(cGrnContext, "connect", rb_grn_context_connect, -1);
     rb_define_method(cGrnContext, "send", rb_grn_context_send, 1);
     rb_define_method(cGrnContext, "receive", rb_grn_context_receive, 0);

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

@@ -89,6 +89,9 @@ static VALUE eGrnSyntaxError;
 static VALUE eGrnRetryMax;
 static VALUE eGrnIncompatibleFileFormat;
 static VALUE eGrnUpdateNotAllowed;
+static VALUE eGrnTooSmallOffset;
+static VALUE eGrnTooLargeOffset;
+static VALUE eGrnTooSmallLimit;
 
 VALUE
 rb_grn_rc_to_exception (grn_rc rc)
@@ -300,6 +303,15 @@ rb_grn_rc_to_exception (grn_rc rc)
       case GRN_UPDATE_NOT_ALLOWED:
         exception = eGrnUpdateNotAllowed;
         break;
+      case GRN_TOO_SMALL_OFFSET:
+        exception = eGrnTooSmallOffset;
+        break;
+      case GRN_TOO_LARGE_OFFSET:
+        exception = eGrnTooLargeOffset;
+        break;
+      case GRN_TOO_SMALL_LIMIT:
+        exception = eGrnTooSmallLimit;
+        break;
     }
 
     if (NIL_P(exception))
@@ -518,6 +530,15 @@ rb_grn_rc_to_message (grn_rc rc)
       case GRN_UPDATE_NOT_ALLOWED:
         message = "update isn't allowed";
         break;
+      case GRN_TOO_SMALL_OFFSET:
+        message = "too small offset";
+        break;
+      case GRN_TOO_LARGE_OFFSET:
+        message = "too large offset";
+        break;
+      case GRN_TOO_SMALL_LIMIT:
+        message = "too small limit";
+        break;
     }
 
     if (!message)
@@ -549,7 +570,7 @@ rb_grn_init_exception (VALUE mGrn)
     /*
      * Document-class: Groonga::Error
      *
-     * Ruby/groongaが発生する例外のスーパークラス。
+     * rroongaが発生する例外のスーパークラス。
      */
     rb_eGrnError =
         rb_define_class_under(mGrn, "Error", rb_eStandardError);
@@ -1107,4 +1128,28 @@ rb_grn_init_exception (VALUE mGrn)
      */
     eGrnUpdateNotAllowed =
         rb_define_class_under(mGrn, "UpdateNotAllowed", rb_eGrnError);
+
+    /*
+     * Document-class: Groonga::TooSmallOffset
+     *
+     * offset値が小さすぎるときに発生する。
+     */
+    eGrnTooSmallOffset =
+        rb_define_class_under(mGrn, "TooSmallOffset", rb_eGrnError);
+
+    /*
+     * Document-class: Groonga::TooLargeOffset
+     *
+     * offset値が大きすぎるときに発生する。
+     */
+    eGrnTooLargeOffset =
+        rb_define_class_under(mGrn, "TooLargeOffset", rb_eGrnError);
+
+    /*
+     * Document-class: Groonga::TooSmallLimit
+     *
+     * limit値が小さすぎるときに発生する。
+     */
+    eGrnTooSmallLimit =
+        rb_define_class_under(mGrn, "TooSmallLimit", rb_eGrnError);
 }

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

@@ -333,7 +333,8 @@ static VALUE
 rb_grn_expression_parse (int argc, VALUE *argv, VALUE self)
 {
     grn_ctx *context = NULL;
-    grn_obj *expression, *default_column = NULL;
+    grn_obj *expression, *default_column;
+    rb_grn_boolean default_column_is_created = RB_GRN_FALSE;
     grn_operator default_operator = GRN_OP_AND;
     grn_operator default_mode = GRN_OP_MATCH;
     grn_rc rc;
@@ -363,7 +364,15 @@ rb_grn_expression_parse (int argc, VALUE *argv, VALUE self)
                                   NULL, NULL,
                                   NULL, NULL, NULL);
 
-    default_column = RVAL2GRNBULK(rb_default_column, context, default_column);
+    if (NIL_P(rb_default_column)) {
+	default_column = NULL;
+    } else if (RVAL2CBOOL(rb_obj_is_kind_of(rb_default_column, rb_cGrnObject))) {
+	default_column = RVAL2GRNOBJECT(rb_default_column, &context);
+    } else {
+	default_column = RVAL2GRNBULK(rb_default_column, context, NULL);
+	default_column_is_created = RB_GRN_TRUE;
+    }
+
     if (!NIL_P(rb_default_mode))
 	default_mode = RVAL2GRNOPERATOR(rb_default_mode);
     if (!NIL_P(rb_default_operator))
@@ -382,10 +391,10 @@ rb_grn_expression_parse (int argc, VALUE *argv, VALUE self)
     }
 
     if (NIL_P(rb_allow_pragma)) {
-	if ((flags & GRN_EXPR_SYNTAX_QUERY) == GRN_EXPR_SYNTAX_QUERY)
+	if (!(flags & GRN_EXPR_SYNTAX_SCRIPT))
 	    flags |= GRN_EXPR_ALLOW_PRAGMA;
     } else {
-	if ((flags & GRN_EXPR_SYNTAX_SCRIPT) == GRN_EXPR_SYNTAX_SCRIPT)
+	if ((flags & GRN_EXPR_SYNTAX_SCRIPT))
 	    rb_raise(rb_eArgError,
 		     ":allow_pragma isn't allowed in script syntax");
 	if (RVAL2CBOOL(rb_allow_pragma))
@@ -393,10 +402,10 @@ rb_grn_expression_parse (int argc, VALUE *argv, VALUE self)
     }
 
     if (NIL_P(rb_allow_column)) {
-	if ((flags & GRN_EXPR_SYNTAX_QUERY) == GRN_EXPR_SYNTAX_QUERY)
+	if (!(flags & GRN_EXPR_SYNTAX_SCRIPT))
 	    flags |= GRN_EXPR_ALLOW_COLUMN;
     } else {
-	if ((flags & GRN_EXPR_SYNTAX_SCRIPT) == GRN_EXPR_SYNTAX_SCRIPT)
+	if ((flags & GRN_EXPR_SYNTAX_SCRIPT))
 	    rb_raise(rb_eArgError,
 		     ":allow_column isn't allowed in script syntax");
 	if (RVAL2CBOOL(rb_allow_column))
@@ -419,7 +428,8 @@ rb_grn_expression_parse (int argc, VALUE *argv, VALUE self)
 	related_object = rb_ary_new3(2, self, rb_ary_new4(argc, argv));
 	exception = rb_grn_context_to_exception(context, related_object);
     }
-    grn_obj_unlink(context, default_column);
+    if (default_column_is_created)
+	grn_obj_unlink(context, default_column);
 
     if (!NIL_P(exception))
 	rb_exc_raise(exception);
@@ -429,26 +439,25 @@ rb_grn_expression_parse (int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   expression.execute
+ *   expression.execute -> 値
  *
- * _expression_を実行する。
+ * _expression_を実行し、実行した結果を返す。
  */
 static VALUE
 rb_grn_expression_execute (VALUE self)
 {
     grn_ctx *context = NULL;
     grn_obj *expression;
-    grn_rc rc;
+    grn_obj *result;
 
     rb_grn_expression_deconstruct(SELF(self), &expression, &context,
                                   NULL, NULL,
                                   NULL, NULL, NULL);
 
-    rc = grn_expr_exec(context, expression, 0);
+    result = grn_expr_exec(context, expression, 0);
     rb_grn_context_check(context, self);
-    rb_grn_rc_check(rc, self);
 
-    return Qnil;
+    return GRNOBJ2RVAL(Qnil, context, result, self);
 }
 
 /*

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  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
@@ -77,13 +77,7 @@ rb_grn_fix_size_column_array_set (VALUE self, VALUE rb_id, VALUE rb_value)
 			      &value, &range_id, &range);
 
     id = NUM2UINT(rb_id);
-    RVAL2GRNBULK(rb_value, context, value);
-    if ((value->header.domain == GRN_DB_INT32 ||
-	 value->header.domain == GRN_DB_UINT32) &&
-	(GRN_TABLE_HASH_KEY <= range->header.type &&
-	 range->header.type <= GRN_TABLE_VIEW)) {
-	value->header.domain = range_id;
-    }
+    RVAL2GRNBULK_WITH_TYPE(rb_value, context, value, range_id, range);
 
     rc = grn_obj_set_value(context, column, id, value, GRN_OBJ_SET);
     rb_grn_context_check(context, self);

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

@@ -62,6 +62,9 @@ VALUE rb_cGrnHash;
  *   Groonga::Contextに結びついているデータベースが一時デー
  *   タベースの場合は例外が発生する。
  *
+ * [+:key_normalize+]
+ *   +true+を指定するとキーを正規化する。
+ *
  * [+:key_type+]
  *   キーの種類を示すオブジェクトを指定する。キーの種類には型
  *   名（"Int32"や"ShortText"など）またはGroonga::Typeまたは
@@ -152,7 +155,7 @@ rb_grn_hash_s_create (int argc, VALUE *argv, VALUE klass)
     grn_obj_flags flags = GRN_TABLE_HASH_KEY;
     VALUE rb_table;
     VALUE options, rb_context, rb_name, rb_path, rb_persistent;
-    VALUE rb_key_type, rb_value_type, rb_default_tokenizer;
+    VALUE rb_key_normalize, rb_key_type, rb_value_type, rb_default_tokenizer;
     VALUE rb_sub_records;
 
     rb_scan_args(argc, argv, "01", &options);
@@ -162,6 +165,7 @@ rb_grn_hash_s_create (int argc, VALUE *argv, VALUE klass)
 			"name", &rb_name,
                         "path", &rb_path,
 			"persistent", &rb_persistent,
+			"key_normalize", &rb_key_normalize,
 			"key_type", &rb_key_type,
 			"value_type", &rb_value_type,
 			"default_tokenizer", &rb_default_tokenizer,
@@ -184,6 +188,9 @@ rb_grn_hash_s_create (int argc, VALUE *argv, VALUE klass)
     if (RVAL2CBOOL(rb_persistent))
 	flags |= GRN_OBJ_PERSISTENT;
 
+    if (RVAL2CBOOL(rb_key_normalize))
+	flags |= GRN_OBJ_KEY_NORMALIZE;
+
     if (NIL_P(rb_key_type)) {
 	flags |= GRN_OBJ_KEY_VAR_SIZE;
     } else {

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

@@ -429,7 +429,7 @@ rb_grn_named_object_set_name (RbGrnNamedObject *rb_grn_named_object,
 			      const char *name, unsigned name_size)
 {
     if (rb_grn_named_object->name) {
-	free(rb_grn_named_object->name);
+	xfree(rb_grn_named_object->name);
 	rb_grn_named_object->name = NULL;
     }
     if (name_size > 0) {

data/ext/groonga/rb-grn-patricia-trie.c

@@ -396,7 +396,7 @@ rb_grn_patricia_trie_scan (VALUE self, VALUE rb_string)
     while (string_length > 0) {
 	const char *rest;
 	int i, n_hits;
-	long previous_offset = 0;
+	unsigned int previous_offset = 0;
 
 	n_hits = grn_pat_scan(context, (grn_pat *)table,
 			      string, string_length,
@@ -469,6 +469,25 @@ rb_grn_patricia_trie_prefix_search (VALUE self, VALUE rb_prefix)
     return rb_result;
 }
 
+/*
+ * call-seq:
+ *   table.register_key_with_sis? -> true/false
+ *
+ * キーを登録するときに文字列の全suffixも一緒に登録する場合
+ * は+true+、登録しない場合は+false+を返す。
+ */
+static VALUE
+rb_grn_patricia_trie_register_key_with_sis_p (VALUE self)
+{
+    grn_obj *table;
+
+    rb_grn_table_key_support_deconstruct(SELF(self), &table, NULL,
+					 NULL, NULL, NULL,
+					 NULL, NULL, NULL,
+					 NULL);
+    return CBOOL2RVAL(table->header.flags & GRN_OBJ_KEY_WITH_SIS);
+}
+
 void
 rb_grn_init_patricia_trie (VALUE mGrn)
 {
@@ -485,4 +504,7 @@ rb_grn_init_patricia_trie (VALUE mGrn)
 		     rb_grn_patricia_trie_scan, 1);
     rb_define_method(rb_cGrnPatriciaTrie, "prefix_search",
 		     rb_grn_patricia_trie_prefix_search, 1);
+
+    rb_define_method(rb_cGrnPatriciaTrie, "register_key_with_sis?",
+		     rb_grn_patricia_trie_register_key_with_sis_p, 0);
 }