rroonga 1.2.5-x86-mingw32 → 1.2.7-x86-mingw32

data/test/test-table-select.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# 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
@@ -53,7 +53,7 @@ class TableSelectTest < Test::Unit::TestCase
                     :user => "darashi")
   end
 
-  def test_select_sub_expression
+  def test_sub_expression
     result = @comments.select do |record|
       record.match("Hello", "content") &
         (record["created_at"] < Time.parse("2009-08-01"))
@@ -61,22 +61,22 @@ class TableSelectTest < Test::Unit::TestCase
     assert_equal_select_result([@comment2], result)
   end
 
-  def test_select_query
+  def test_query
     result = @comments.select("content:@Hello")
     assert_equal_select_result([@comment1, @comment2], result)
   end
 
-  def test_select_query_with_parser
+  def test_query_with_parser
     result = @comments.select("content @ \"Hello\"", :syntax => :script)
     assert_equal_select_result([@comment1, @comment2], result)
   end
 
-  def test_select_query_with_default_column
+  def test_query_with_default_column
     result = @comments.select("Hello", {:default_column => 'content'})
     assert_equal_select_result([@comment1, @comment2], result)
   end
 
-  def test_select_expression
+  def test_expression
     expression = Groonga::Expression.new
     variable = expression.define_variable(:domain => @comments)
     expression.append_object(variable)
@@ -87,76 +87,90 @@ class TableSelectTest < Test::Unit::TestCase
     assert_equal_select_result([@comment1, @comment2], result)
   end
 
-  def test_select_query_with_block
+  def test_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
+  def test_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
+  def test_without_block
     assert_equal_select_result([@comment1, @comment2,
                                 @comment3, @japanese_comment],
                                @comments.select)
   end
 
-  def test_select_query_japanese
+  def test_query_japanese
     result = @comments.select("content:@ボロTV")
     assert_equal_select_result([@japanese_comment], result)
   end
 
-  def test_select_but_query
+  def test_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
+  def test_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
+  def test_query_with_brackets
     result = @comments.select do |record|
       record["content"].match "Say (Hello World)"
     end
     assert_equal_select_result([], result)
   end
 
-  def test_select_equal_reference_column_by_key
+  def test_equal_reference_column_by_key
     result = @comments.select do |record|
       record["user"] == "darashi"
     end
     assert_equal_select_result([@japanese_comment], result)
   end
 
-  def test_select_not_equal_reference_column_by_key
+  def test_not_equal_reference_column_by_key
     result = @comments.select('user != "darashi"', :syntax => :script)
     assert_equal_select_result([@comment1, @comment2, @comment3],
                                result)
   end
 
-  def test_select_equal_reference_column_by_nonexistent_key
+  def test_equal_reference_column_by_nonexistent_key
     result = @comments.select do |record|
       record["user"] == "nonexistent"
     end
     assert_equal_select_result([], result)
   end
 
-  def test_select_query_key
+  def test_query_key
     result = @users.select do |record|
       record["_key"] =~ "mori"
     end
     assert_equal_select_result([@users["morita"]], result)
   end
+
+  def test_symbol
+    result = @comments.select do |record|
+      record[:content].match("Say Hello World")
+    end
+    assert_equal_select_result([], result)
+  end
+
+  def test_method
+    result = @comments.select do |record|
+      record.content.match("Say Hello World")
+    end
+    assert_equal_select_result([], result)
+  end
 end

data/test/test-type.rb

@@ -23,12 +23,12 @@ class TypeTest < Test::Unit::TestCase
     assert_equal("user_id", type.name)
   end
 
-  def test_new_with_hyphen_name
+  def test_new_with_space_name
     exception = assert_raise(Groonga::InvalidArgument) do
-      Groonga::Type.new("user-id", :type => :integer)
+      Groonga::Type.new("user id", :type => :integer)
     end
     message =
-      "name can't start with '_' and 0-9, and contains only 0-9, A-Z, a-z, or _"
+      "name can't start with '_' and contains only 0-9, A-Z, a-z, #, - or _"
     assert_match(/#{Regexp.escape(message)}/,
                  exception.message)
   end

data/test/test-variable-size-column.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009  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
@@ -107,4 +107,11 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     @morita.prepend("nick_names", "moritapo")
     assert_equal(["moritapo", "morita"], @morita["nick_names"])
   end
+
+  def test_defrag
+    1000.times do |i|
+      @users.add(:name => "user #{i}" * 1000)
+    end
+    assert_equal(3, @name.defrag)
+  end
 end

data/vendor/local/bin/mecab-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/home/kou/work/c/groonga.central/packages/windows/dist
+prefix=/home/kou/work/c/groonga.clean/packages/windows/dist
 exec_prefix=${prefix}
 exec_prefix_set=no
 
@@ -107,7 +107,7 @@ while test $# -gt 0; do
 	;;
 
     --libexecdir)
-       	echo /home/kou/work/c/groonga.central/packages/windows/dist/libexec/mecab
+       	echo /home/kou/work/c/groonga.clean/packages/windows/dist/libexec/mecab
        	;;
 	
     --sysconfdir)

data/vendor/local/include/groonga/groonga.h

@@ -206,9 +206,21 @@ struct _grn_ctx {
 
 #define GRN_CTX_USE_QL                 (0x03)
 #define GRN_CTX_BATCH_MODE             (0x04)
+#define GRN_CTX_PER_DB                 (0x08)
 
 GRN_API grn_rc grn_ctx_init(grn_ctx *ctx, int flags);
 
+/**
+ * grn_ctx_fin:
+ * @ctx: 解放するctx構造体へのポインタを指定します。
+ *
+ * ctxの管理するメモリを解放し、使用を終了します。
+ *
+ * If @ctx is initialized by grn_ctx_open() not
+ * grn_ctx_init(). You need also to call grn_ctx_close().
+ **/
+GRN_API grn_rc grn_ctx_fin(grn_ctx *ctx);
+
 /**
  * grn_ctx_open:
  * @flags: 初期化するctxのオプションを指定します。
@@ -225,12 +237,13 @@ GRN_API grn_rc grn_ctx_init(grn_ctx *ctx, int flags);
 GRN_API grn_ctx *grn_ctx_open(int flags);
 
 /**
- * grn_ctx_fin:
- * @ctx: 解放するctx構造体へのポインタを指定します。
+ * grn_ctx_close:
+ * @ctx: no longer needed grn_ctx.
  *
- * ctxの管理するメモリを解放し、使用を終了します。
+ * It calls grn_ctx_fin() and frees allocated memory for
+ * @ctx by grn_ctx_open().
  **/
-GRN_API grn_rc grn_ctx_fin(grn_ctx *ctx);
+GRN_API grn_rc grn_ctx_close(grn_ctx *ctx);
 
 /**
  * grn_ctx_set_finalizer:
@@ -514,6 +527,8 @@ GRN_API void grn_db_touch(grn_ctx *ctx, grn_obj *db);
  *
  * ctxが操作対象とするdbを指定します。NULLを指定した場合は、
  * dbを操作しない状態(init直後の状態)になります。
+ *
+ * Don't use it with grn_ctx that has GRN_CTX_PER_DB flag.
  **/
 GRN_API grn_rc grn_ctx_use(grn_ctx *ctx, grn_obj *db);
 
@@ -685,6 +700,7 @@ GRN_API grn_obj *grn_table_create(grn_ctx *ctx,
  * keyに対応するrecordがすでにtableに存在するならば、そのrecordのIDを返す。
  * GRN_OBJ_TABLE_NO_KEYが指定されたtableでは、key, key_size は無視される。
  **/
+/* TODO: int *added -> grn_bool *added */
 GRN_API grn_id grn_table_add(grn_ctx *ctx, grn_obj *table,
                              const void *key, unsigned key_size, int *added);
 

data/vendor/local/lib/groonga/plugins/suggest/suggest.la

@@ -1,5 +1,5 @@
 # suggest.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4 Debian-2.4-2
+# Generated by libtool (GNU libtool) 2.4 Debian-2.4-3
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='suggest.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' /home/kou/work/c/groonga.central/packages/windows/dist/lib/libgroonga.la -lws2_32'
+dependency_libs=' /home/kou/work/c/groonga.clean/packages/windows/dist/lib/libgroonga.la -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/c/groonga.central/packages/windows/dist/lib/groonga/plugins/suggest'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist/lib/groonga/plugins/suggest'

data/vendor/local/lib/groonga/plugins/tokenizers/mecab.la

@@ -1,5 +1,5 @@
 # mecab.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4 Debian-2.4-2
+# Generated by libtool (GNU libtool) 2.4 Debian-2.4-3
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='mecab.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kou/work/c/groonga.central/packages/windows/dist/lib /home/kou/work/c/groonga.central/packages/windows/dist/lib/libmecab.la /home/kou/work/c/groonga.central/packages/windows/dist/lib/libgroonga.la -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist/lib /home/kou/work/c/groonga.clean/packages/windows/dist/lib/libmecab.la /home/kou/work/c/groonga.clean/packages/windows/dist/lib/libgroonga.la -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/c/groonga.central/packages/windows/dist/lib/groonga/plugins/tokenizers'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist/lib/groonga/plugins/tokenizers'

data/vendor/local/lib/libgroonga.la

@@ -1,5 +1,5 @@
 # libgroonga.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4 Debian-2.4-2
+# Generated by libtool (GNU libtool) 2.4 Debian-2.4-3
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/c/groonga.central/packages/windows/dist/lib'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist/lib'

data/vendor/local/lib/libmecab.la

@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/c/groonga.central/packages/windows/dist/lib'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist/lib'

data/vendor/local/lib/pkgconfig/groonga.pc

@@ -1,4 +1,4 @@
-prefix=/home/kou/work/c/groonga.central/packages/windows/dist
+prefix=/home/kou/work/c/groonga.clean/packages/windows/dist
 exec_prefix=${prefix}
 bindir=${exec_prefix}/bin
 libdir=${exec_prefix}/lib
@@ -8,6 +8,6 @@ groonga_suggest_create_dataset=${bindir}/groonga-suggest-create-dataset.exe
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 1.2.4
+Version: 1.2.5
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga

data/vendor/local/share/doc/groonga/en/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 09bdccb1b5c8e5d08a3aed4a7d6f8233
+config: b6b362d161e603cf11c7590fceaa7a26
 tags: fbb0d17656682115ca4d033fb2f83ba1