groonga?????

From null at cozmixng.org Fri Jan 8 02:35:30 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Fri, 08 Jan 2010 16:35:30 +0900 Subject: [groonga-commit:861] groonga [groonga (trunk) r907] * implement Groonga::PatriciaTrie#prefix_search. Message-ID: <20100108073530.99A981D1CE8@mail.cozmixng.org> retro 2010-01-08 16:35:30 +0900 (Fri, 08 Jan 2010) New Revision: 907 Log: * implement Groonga::PatriciaTrie#prefix_search. Modified files: groonga/trunk/ext/rb-grn-patricia-trie.c groonga/trunk/test/test-patricia-trie.rb Modified: groonga/trunk/ext/rb-grn-patricia-trie.c (+40 -0) =================================================================== --- groonga/trunk/ext/rb-grn-patricia-trie.c 2009-12-22 14:35:08 +09:00 (rev 906) +++ groonga/trunk/ext/rb-grn-patricia-trie.c 2010-01-08 16:35:30 +09:00 (rev 907) @@ -1,4 +1,5 @@ /* -*- c-file-style: "ruby" -*- */ +/* vim: set sts=4 sw=4 ts=8 noet: */ /* Copyright (C) 2009 Kouhei Sutou @@ -430,6 +431,43 @@ return rb_result; } +/* + * call-seq: + * patricia_trie.prefix_search(prefix) -> Groonga::Hash + * + * ???_prefix_????????????ID????????? + * Groonga::Hash????????????????????? + * Groonga::Hash???? + * + */ +static VALUE +rb_grn_patricia_trie_prefix_search (VALUE self, VALUE rb_prefix) +{ + grn_ctx *context; + grn_obj *table, *key, *domain, *result; + grn_id domain_id; + VALUE rb_result; + + rb_grn_table_key_support_deconstruct(SELF(self), &table, &context, + &key, &domain_id, &domain, + NULL, NULL, NULL); + + result = grn_table_create(context, NULL, 0, NULL, + GRN_OBJ_TABLE_HASH_KEY, + table, 0); + rb_grn_context_check(context, self); + rb_result = GRNOBJECT2RVAL(Qnil, context, result, RB_GRN_TRUE); + + GRN_BULK_REWIND(key); + RVAL2GRNKEY(rb_prefix, context, key, domain_id, domain, self); + grn_pat_prefix_search(context, (grn_pat *)table, + GRN_BULK_HEAD(key), GRN_BULK_VSIZE(key), + (grn_hash *)result); + rb_grn_context_check(context, self); + + return rb_result; +} + void rb_grn_init_patricia_trie (VALUE mGrn) { @@ -444,4 +482,6 @@ rb_grn_patricia_trie_search, -1); rb_define_method(rb_cGrnPatriciaTrie, "scan", rb_grn_patricia_trie_scan, 1); + rb_define_method(rb_cGrnPatriciaTrie, "prefix_search", + rb_grn_patricia_trie_prefix_search, 1); } Modified: groonga/trunk/test/test-patricia-trie.rb (+21 -0) =================================================================== --- groonga/trunk/test/test-patricia-trie.rb 2009-12-22 14:35:08 +09:00 (rev 906) +++ groonga/trunk/test/test-patricia-trie.rb 2010-01-08 16:35:30 +09:00 (rev 907) @@ -158,4 +158,25 @@ end assert_equal(text, actual) end + + def test_prefix_search + 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') + + records = paths.prefix_search('/') + assert_equal(["/usr/local/bin", "/usr/bin", "/tmp", "/"], + records.records.collect {|record| record["._key"]}) + + records = paths.prefix_search('/usr') + assert_equal(["/usr/local/bin", "/usr/bin"], + records.records.collect {|record| record["._key"]}) + + records = paths.prefix_search('/usr/local') + assert_equal(["/usr/local/bin"], + records.records.collect {|record| record["._key"]}) + end end From null at cozmixng.org Fri Jan 8 19:20:27 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 09:20:27 +0900 Subject: [groonga-commit:862] groonga [groonga (trunk) r908] * add a prefix search test for no match case. Message-ID: <20100109002027.09FBB1D1CE4@mail.cozmixng.org> retro 2010-01-09 09:20:26 +0900 (Sat, 09 Jan 2010) New Revision: 908 Log: * add a prefix search test for no match case. Modified files: groonga/trunk/test/test-patricia-trie.rb Modified: groonga/trunk/test/test-patricia-trie.rb (+4 -0) =================================================================== --- groonga/trunk/test/test-patricia-trie.rb 2010-01-08 16:27:50 +09:00 (rev 907) +++ groonga/trunk/test/test-patricia-trie.rb 2010-01-09 09:20:26 +09:00 (rev 908) @@ -178,5 +178,9 @@ records = paths.prefix_search('/usr/local') assert_equal(["/usr/local/bin"], records.records.collect {|record| record["._key"]}) + + records = paths.prefix_search('nonexistent') + assert_equal([], + records.records.collect {|record| record["._key"]}) end end From null at cozmixng.org Fri Jan 8 20:05:24 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 10:05:24 +0900 Subject: [groonga-commit:863] groonga [groonga (trunk) r909] * support Bool. Message-ID: <20100109010524.36B6C1D1CE4@mail.cozmixng.org> retro 2010-01-09 10:05:23 +0900 (Sat, 09 Jan 2010) New Revision: 909 Log: * support Bool. Patched by Tasuku SUENAGA. Thanks!!! Modified files: groonga/trunk/ext/rb-grn-utils.c groonga/trunk/test/test-column.rb Modified: groonga/trunk/ext/rb-grn-utils.c (+22 -3) =================================================================== --- groonga/trunk/ext/rb-grn-utils.c 2010-01-09 09:19:45 +09:00 (rev 908) +++ groonga/trunk/ext/rb-grn-utils.c 2010-01-09 10:05:23 +09:00 (rev 909) @@ -1,4 +1,5 @@ /* -*- c-file-style: "ruby" -*- */ +/* vim: set sts=4 sw=4 ts=8 noet: */ /* Copyright (C) 2009 Kouhei Sutou @@ -96,6 +97,9 @@ case GRN_DB_VOID: *rb_value = rb_str_new(GRN_TEXT_VALUE(bulk), GRN_TEXT_LEN(bulk)); break; + case GRN_DB_BOOL: + *rb_value = GRN_BOOL_VALUE(bulk) ? Qtrue : Qfalse; + break; case GRN_DB_INT32: *rb_value = INT2NUM(GRN_INT32_VALUE(bulk)); break; @@ -239,6 +243,12 @@ grn_obj_reinit(context, bulk, GRN_DB_FLOAT, 0); GRN_FLOAT_SET(context, bulk, NUM2DBL(object)); break; + case T_TRUE: + GRN_BOOL_SET(context, bulk, GRN_TRUE); + break; + case T_FALSE: + GRN_BOOL_SET(context, bulk, GRN_FALSE); + break; default: if (RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cTime))) { VALUE sec, usec; @@ -269,7 +279,8 @@ } else { rb_raise(rb_eTypeError, "bulked object should be one of " - "[nil, String, Integer, Float, Time, Groonga::Object]: %s", + "[nil, true, false, String, Integer, Float, Time, " + "Groonga::Object]: %s", rb_grn_inspect(object)); } break; @@ -679,6 +690,14 @@ grn_obj_reinit(context, obj, GRN_DB_FLOAT, 0); GRN_FLOAT_SET(context, obj, NUM2DBL(rb_object)); break; + case T_TRUE: + grn_obj_reinit(context, obj, GRN_DB_BOOL, 0); + GRN_BOOL_SET(context, obj, GRN_TRUE); + break; + case T_FALSE: + grn_obj_reinit(context, obj, GRN_DB_BOOL, 0); + GRN_BOOL_SET(context, obj, GRN_FALSE); + break; default: if (RVAL2CBOOL(rb_obj_is_kind_of(rb_object, rb_cTime))) { VALUE sec, usec; @@ -709,8 +728,8 @@ } else { rb_raise(rb_eTypeError, "should be one of " - "[nil, String, Integer, Float, Time, Groonga::Object, " - "Groonga::Record]: <%s>", + "[nil, true, false, String, Integer, Float, Time, " + "Groonga::Object, Groonga::Record]: <%s>", rb_grn_inspect(rb_object)); } break; Modified: groonga/trunk/test/test-column.rb (+15 -1) =================================================================== --- groonga/trunk/test/test-column.rb 2010-01-09 09:19:45 +09:00 (rev 908) +++ groonga/trunk/test/test-column.rb 2010-01-09 10:05:23 +09:00 (rev 909) @@ -177,7 +177,7 @@ def test_select_query populate_table_for_select - + result = @body.select("drive") assert_equal(["Drive and Eat"], result.records.collect do |record| @@ -254,6 +254,20 @@ assert_equal(Time.at(0), post["issued"]) end + def test_bool + posts = Groonga::Hash.create(:name => "Posts", :key_type => "ShortText") + hidden = posts.define_column("hidden", "Bool") + + post = posts.add("hello") + assert_false(post["hidden"]) + + post["hidden"] = true + assert_true(post["hidden"]) + + post["hidden"] = false + assert_false(post["hidden"]) + end + private def assert_content_search(expected_records, term) records = @bookmarks_index_content.search(term).records From null at cozmixng.org Fri Jan 8 20:35:24 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 10:35:24 +0900 Subject: [groonga-commit:864] groonga [groonga (trunk) r910] * unify groonga -> Ruby conversion routine. Message-ID: <20100109013524.A00C91D1CE5@mail.cozmixng.org> retro 2010-01-09 10:35:24 +0900 (Sat, 09 Jan 2010) New Revision: 910 Log: * unify groonga -> Ruby conversion routine. Modified files: groonga/trunk/ext/rb-grn-utils.c Modified: groonga/trunk/ext/rb-grn-utils.c (+13 -78) =================================================================== --- groonga/trunk/ext/rb-grn-utils.c 2010-01-09 09:52:29 +09:00 (rev 909) +++ groonga/trunk/ext/rb-grn-utils.c 2010-01-09 10:35:24 +09:00 (rev 910) @@ -219,7 +219,7 @@ grn_obj_reinit(context, bulk, GRN_DB_VOID, 0); break; case T_STRING: - grn_obj_reinit(context, bulk, GRN_DB_TEXT, GRN_OBJ_DO_SHALLOW_COPY); + grn_obj_reinit(context, bulk, GRN_DB_TEXT, 0); GRN_TEXT_SET(context, bulk, RSTRING_PTR(object), RSTRING_LEN(object)); break; case T_FIXNUM: @@ -244,9 +244,11 @@ GRN_FLOAT_SET(context, bulk, NUM2DBL(object)); break; case T_TRUE: + grn_obj_reinit(context, bulk, GRN_DB_BOOL, 0); GRN_BOOL_SET(context, bulk, GRN_TRUE); break; case T_FALSE: + grn_obj_reinit(context, bulk, GRN_DB_BOOL, 0); GRN_BOOL_SET(context, bulk, GRN_FALSE); break; default: @@ -254,10 +256,10 @@ VALUE sec, usec; int64_t time_value; - grn_obj_reinit(context, bulk, GRN_DB_TIME, 0); sec = rb_funcall(object, rb_intern("to_i"), 0); usec = rb_funcall(object, rb_intern("usec"), 0); time_value = GRN_TIME_PACK(NUM2LL(sec), NUM2LL(usec)); + grn_obj_reinit(context, bulk, GRN_DB_TIME, 0); GRN_TIME_SET(context, bulk, time_value); } else if (RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGrnObject))) { grn_obj *grn_object; @@ -273,14 +275,14 @@ table = RVAL2GRNOBJECT(rb_funcall(object, rb_intern("table"), 0), &context); - grn_obj_reinit(context, bulk, grn_obj_id(context, table), 0); id_value = NUM2UINT(rb_funcall(object, rb_intern("id"), 0)); + grn_obj_reinit(context, bulk, grn_obj_id(context, table), 0); GRN_RECORD_SET(context, bulk, id_value); } else { rb_raise(rb_eTypeError, "bulked object should be one of " "[nil, true, false, String, Integer, Float, Time, " - "Groonga::Object]: %s", + "Groonga::Object, Groonga::Record]: %s", rb_grn_inspect(object)); } break; @@ -659,83 +661,16 @@ grn_obj * rb_grn_obj_from_ruby_object (VALUE rb_object, grn_ctx *context, grn_obj **_obj) { - grn_obj *obj; - - if (*_obj) { - obj = *_obj; - grn_obj_close(context, obj); /* FIXME: grn_obj_reinit() */ + if (RVAL2CBOOL(rb_obj_is_kind_of(rb_object, rb_cGrnObject))) { + if (*_obj) { + grn_obj_close(context, *_obj); /* TODO: reduce memory allocation */ + } + *_obj = RVAL2GRNOBJECT(rb_object, &context); } else { - *_obj = grn_obj_open(context, GRN_VOID, 0, GRN_ID_NIL); - obj = *_obj; + *_obj = RVAL2GRNBULK(rb_object, context, *_obj); } - switch (TYPE(rb_object)) { - case T_NIL: - grn_obj_reinit(context, obj, GRN_DB_VOID, 0); - break; - case T_STRING: - grn_obj_reinit(context, obj, GRN_DB_TEXT, 0); - GRN_TEXT_SET(context, obj, - RSTRING_PTR(rb_object), RSTRING_LEN(rb_object)); - break; - case T_FIXNUM: - grn_obj_reinit(context, obj, GRN_DB_INT32, 0); - GRN_INT32_SET(context, obj, NUM2INT(rb_object)); - break; - case T_BIGNUM: - grn_obj_reinit(context, obj, GRN_DB_INT64, 0); - GRN_INT64_SET(context, obj, NUM2LL(rb_object)); - break; - case T_FLOAT: - grn_obj_reinit(context, obj, GRN_DB_FLOAT, 0); - GRN_FLOAT_SET(context, obj, NUM2DBL(rb_object)); - break; - case T_TRUE: - grn_obj_reinit(context, obj, GRN_DB_BOOL, 0); - GRN_BOOL_SET(context, obj, GRN_TRUE); - break; - case T_FALSE: - grn_obj_reinit(context, obj, GRN_DB_BOOL, 0); - GRN_BOOL_SET(context, obj, GRN_FALSE); - break; - default: - if (RVAL2CBOOL(rb_obj_is_kind_of(rb_object, rb_cTime))) { - VALUE sec, usec; - int64_t time_value; - - sec = rb_funcall(rb_object, rb_intern("to_i"), 0); - usec = rb_funcall(rb_object, rb_intern("usec"), 0); - time_value = GRN_TIME_PACK(NUM2LL(sec), NUM2LL(usec)); - grn_obj_reinit(context, obj, GRN_DB_TIME, 0); - GRN_TIME_SET(context, obj, time_value); - } else if (RVAL2CBOOL(rb_obj_is_kind_of(rb_object, rb_cGrnObject))) { - grn_obj_close(context, obj); /* TODO: reduce memory allocation */ - *_obj = RVAL2GRNOBJECT(rb_object, &context); - obj = *_obj; - } else if (RVAL2CBOOL(rb_obj_is_kind_of(rb_object, rb_cGrnRecord))) { - grn_id id, table_id; - VALUE rb_table; - grn_obj *table = NULL; - - id = NUM2UINT(rb_funcall(rb_object, rb_intern("id"), 0)); - rb_table = rb_funcall(rb_object, rb_intern("table"), 0); - rb_grn_table_deconstruct(RB_GRN_TABLE(DATA_PTR(rb_table)), - &table, NULL, - NULL, NULL, NULL, NULL, NULL); - table_id = grn_obj_id(context, table); - grn_obj_reinit(context, obj, table_id, 0); - GRN_RECORD_SET(context, obj, id); - } else { - rb_raise(rb_eTypeError, - "should be one of " - "[nil, true, false, String, Integer, Float, Time, " - "Groonga::Object, Groonga::Record]: <%s>", - rb_grn_inspect(rb_object)); - } - break; - } - - return obj; + return *_obj; } VALUE From null at cozmixng.org Fri Jan 8 20:35:26 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 10:35:26 +0900 Subject: [groonga-commit:865] groonga [groonga (trunk) r911] * use the current groonga type name. Message-ID: <20100109013526.1451A1D1CE8@mail.cozmixng.org> retro 2010-01-09 10:35:25 +0900 (Sat, 09 Jan 2010) New Revision: 911 Log: * use the current groonga type name. Modified files: groonga/trunk/test/test-array.rb Modified: groonga/trunk/test/test-array.rb (+11 -11) =================================================================== --- groonga/trunk/test/test-array.rb 2010-01-09 10:24:35 +09:00 (rev 910) +++ groonga/trunk/test/test-array.rb 2010-01-09 10:35:25 +09:00 (rev 911) @@ -41,21 +41,21 @@ end def test_add - users = Groonga::Array.create(:name => "") - users.define_column("name", "") + users = Groonga::Array.create(:name => "Users") + users.define_column("name", "Text") me = users.add(:name => "me") assert_equal("me", me[:name]) end def test_define_index_column - users = Groonga::Array.create(:name => "") - users.define_column("name", "") - bookmarks = Groonga::Array.create(:name => "") - bookmarks.define_column("title", "") + users = Groonga::Array.create(:name => "Users") + users.define_column("name", "Text") + bookmarks = Groonga::Array.create(:name => "Bookmarks") + bookmarks.define_column("title", "Text") bookmarks.define_column("user", users) index = users.define_index_column("bookmarks", bookmarks, - :source => ".user") + :source => "Bookmarks.user") morita = users.add(:name => "morita") gunyara_kun = users.add(:name => "gunyara-kun") groonga = bookmarks.add(:title => "groonga", :user => morita) @@ -67,15 +67,15 @@ end def test_create_duplicated_name - Groonga::Array.create(:name => "") + Groonga::Array.create(:name => "Users") assert_raise(Groonga::InvalidArgument) do - Groonga::Array.create(:name => "") + Groonga::Array.create(:name => "Users") end end def test_open_same_name - users_created = Groonga::Array.create(:name => "") - users_opened = Groonga::Array.open(:name => "") + users_created = Groonga::Array.create(:name => "Users") + users_opened = Groonga::Array.open(:name => "Users") users_opened.add assert_equal(1, users_created.size) end From null at cozmixng.org Sat Jan 9 00:50:37 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 14:50:37 +0900 Subject: [groonga-commit:866] groonga [groonga (trunk) r912] * use the current groonga type name. Message-ID: <20100109055037.A9EF41D1CE5@mail.cozmixng.org> retro 2010-01-09 14:50:37 +0900 (Sat, 09 Jan 2010) New Revision: 912 Log: * use the current groonga type name. Modified files: groonga/trunk/test/test-column.rb Modified: groonga/trunk/test/test-column.rb (+31 -31) =================================================================== --- groonga/trunk/test/test-column.rb 2010-01-09 10:34:12 +09:00 (rev 911) +++ groonga/trunk/test/test-column.rb 2010-01-09 14:50:37 +09:00 (rev 912) @@ -26,31 +26,31 @@ def setup_users_table @users_path = @tables_dir + "users" - @users = Groonga::Array.create(:name => "users", + @users = Groonga::Array.create(:name => "Users", :path => @users_path.to_s) @users_name_column_path = @columns_dir + "name" @users_name_column = - @users.define_column("name", "", + @users.define_column("name", "ShortText", :path => @users_name_column_path.to_s) end def setup_bookmarks_table @bookmarks_path = @tables_dir + "bookmarks" - @bookmarks = Groonga::Array.create(:name => "bookmarks", + @bookmarks = Groonga::Array.create(:name => "Bookmarks", :path => @bookmarks_path.to_s) @uri_column_path = @columns_dir + "uri" - @bookmarks_uri = @bookmarks.define_column("uri", "", + @bookmarks_uri = @bookmarks.define_column("uri", "ShortText", :path => @uri_column_path.to_s) @comment_column_path = @columns_dir + "comment" @bookmarks_comment = - @bookmarks.define_column("comment", "", + @bookmarks.define_column("comment", "Text", :path => @comment_column_path.to_s) @content_column_path = @columns_dir + "content" - @bookmarks_content = @bookmarks.define_column("content", "") + @bookmarks_content = @bookmarks.define_column("content", "LongText") @user_column_path = @columns_dir + "user" @bookmarks_user = @bookmarks.define_column("user", @users) @@ -117,16 +117,16 @@ end def test_accessor - posts = Groonga::Hash.create(:name => "", :key_type => "") - posts.define_column("body", "") - comments = Groonga::Hash.create(:name => "", - :key_type => "") - content = comments.define_column("content", "") + posts = Groonga::Hash.create(:name => "Posts", :key_type => "ShortText") + posts.define_column("body", "Text") + comments = Groonga::Hash.create(:name => "Comments", + :key_type => "ShortText") + content = comments.define_column("content", "ShortText") comments.define_column("post", posts) - index = Groonga::PatriciaTrie.create(:name => "", - :key_type => "") - index.default_tokenizer = "" + index = Groonga::PatriciaTrie.create(:name => "Terms", + :key_type => "ShortText") + index.default_tokenizer = "TokenBigram" content_index = index.define_index_column("content_index", comments, :with_position => true) content_index.source = content @@ -158,20 +158,20 @@ end def test_array_set_with_key_of_table - users = Groonga::Hash.create(:name => "", - :key_type => "ShortText") - bookmarks = Groonga::Hash.create(:name => "") - bookmarks.define_column("user", users) + languages = Groonga::Hash.create(:name => "Languages", + :key_type => "ShortText") + sites = Groonga::Hash.create(:name => "Sites") + sites.define_column("language", languages) - users.add("morita") - groonga = bookmarks.add("http://groonga.org/", :user => "morita") - assert_equal("morita", groonga[:user].key) + languages.add("Ruby") + taiyaki_ru = sites.add("http://taiyaki.ru/", :language => "Ruby") + assert_equal("Ruby", taiyaki_ru[:language].key) end def test_local_name - items = Groonga::Array.create(:name => "") - title = items.define_column("title", "") - assert_equal(".title", title.name) + items = Groonga::Array.create(:name => "Items") + title = items.define_column("title", "ShortText") + assert_equal("Items.title", title.name) assert_equal("title", title.local_name) end @@ -235,8 +235,8 @@ end def test_set_time - posts = Groonga::Hash.create(:name => "", :key_type => "") - body = posts.define_column("issued", "") + 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"]) @@ -281,13 +281,13 @@ end def populate_table_for_select - @posts = Groonga::Hash.create(:name => "", :key_type => "") - @body = @posts.define_column("body", "") + @posts = Groonga::Hash.create(:name => "Posts", :key_type => "ShortText") + @body = @posts.define_column("body", "Text") - index = Groonga::PatriciaTrie.create(:name => "", - :key_type => "", + index = Groonga::PatriciaTrie.create(:name => "Terms", + :key_type => "ShortText", :key_normalize => true) - index.default_tokenizer = "" + index.default_tokenizer = "TokenBigram" body_index = index.define_index_column("body_index", @posts, :with_position => true, :source => @body) From null at cozmixng.org Sat Jan 9 00:50:39 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 14:50:39 +0900 Subject: [groonga-commit:867] groonga [groonga (trunk) r913] * use the current groonga type name. Message-ID: <20100109055039.2F6671D1CE9@mail.cozmixng.org> retro 2010-01-09 14:50:38 +0900 (Sat, 09 Jan 2010) New Revision: 913 Log: * use the current groonga type name. Modified files: groonga/trunk/test/test-expression-builder.rb groonga/trunk/test/test-expression.rb Modified: groonga/trunk/test/test-expression-builder.rb (+5 -5) =================================================================== --- groonga/trunk/test/test-expression-builder.rb 2010-01-09 14:47:42 +09:00 (rev 912) +++ groonga/trunk/test/test-expression-builder.rb 2010-01-09 14:50:38 +09:00 (rev 913) @@ -21,15 +21,15 @@ setup :setup_data def setup_tables - @users = Groonga::Hash.create(:name => "") - @name = @users.define_column("name", "") - @hp = @users.define_column("hp", "") + @users = Groonga::Hash.create(:name => "Users") + @name = @users.define_column("name", "ShortText") + @hp = @users.define_column("hp", "UInt32") - @terms = Groonga::PatriciaTrie.create(:name => "", + @terms = Groonga::PatriciaTrie.create(:name => "Terms", :default_tokenizer => "TokenBigram") @terms.define_index_column("user-name", @users, :source => @name) - @bookmarks = Groonga::Array.create(:name => "bookmarks") + @bookmarks = Groonga::Array.create(:name => "Bookmarks") @bookmarks.define_column("user", @users) @bookmarks.define_column("uri", "ShortText") end Modified: groonga/trunk/test/test-expression.rb (+8 -8) =================================================================== --- groonga/trunk/test/test-expression.rb 2010-01-09 14:47:42 +09:00 (rev 912) +++ groonga/trunk/test/test-expression.rb 2010-01-09 14:50:38 +09:00 (rev 913) @@ -50,8 +50,8 @@ end def test_get_value_with_variable - users = Groonga::Hash.create(:name => "") - name = users.define_column("name", "") + users = Groonga::Hash.create(:name => "Users") + name = users.define_column("name", "ShortText") morita = users.add("morita", :name => "mori daijiro") gunyara_kun = users.add("gunyara-kun", :name => "Tasuku SUENAGA") @@ -82,13 +82,13 @@ end def test_snippet - users = Groonga::Array.create(:name => "users") + users = Groonga::Array.create(:name => "Users") name = users.define_column("name", "ShortText") - terms = Groonga::Hash.create(:name => "terms", + terms = Groonga::Hash.create(:name => "Terms", :key_type => "ShortText", :default_tokenizer => "TokenBigram") users.define_index_column("user_name", users, - :source => "users.name", + :source => "Users.name", :with_position => true) expression = Groonga::Expression.new @@ -111,13 +111,13 @@ end def test_snippet_without_tags - users = Groonga::Array.create(:name => "users") + users = Groonga::Array.create(:name => "Users") name = users.define_column("name", "ShortText") - terms = Groonga::Hash.create(:name => "terms", + terms = Groonga::Hash.create(:name => "Terms", :key_type => "ShortText", :default_tokenizer => "TokenBigram") users.define_index_column("user_name", users, - :source => "users.name", + :source => "Users.name", :with_position => true) expression = Groonga::Expression.new From null at cozmixng.org Sat Jan 9 01:05:30 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 15:05:30 +0900 Subject: [groonga-commit:868] groonga [groonga (trunk) r914] * use the current groonga type name. Message-ID: <20100109060530.ADBE61D1CE5@mail.cozmixng.org> retro 2010-01-09 15:05:30 +0900 (Sat, 09 Jan 2010) New Revision: 914 Log: * use the current groonga type name. Modified files: groonga/trunk/test/test-fix-size-column.rb groonga/trunk/test/test-hash.rb Modified: groonga/trunk/test/test-fix-size-column.rb (+5 -5) =================================================================== --- groonga/trunk/test/test-fix-size-column.rb 2010-01-09 14:50:05 +09:00 (rev 913) +++ groonga/trunk/test/test-fix-size-column.rb 2010-01-09 15:05:30 +09:00 (rev 914) @@ -24,21 +24,21 @@ def setup_bookmarks_table @bookmarks_path = @tables_dir + "bookmarks" - @bookmarks = Groonga::Array.create(:name => "bookmarks", + @bookmarks = Groonga::Array.create(:name => "Bookmarks", :path => @bookmarks_path.to_s) @viewed_column_path = @columns_dir + "viewed" - @viewed = @bookmarks.define_column("viewed", "", + @viewed = @bookmarks.define_column("viewed", "Int32", :path => @viewed_column_path.to_s) end def test_inspect assert_equal("#, " + - "name: , " + + "name: , " + "path: <#{@viewed_column_path}>, " + "domain: <#{@bookmarks.inspect}>, " + - "range: <#{context[''].inspect}>, " + + "range: <#{context['Int32'].inspect}>, " + "flags: " + ">", @viewed.inspect) @@ -53,7 +53,7 @@ end def test_assign_time - comments = Groonga::Array.create(:name => "comments") + comments = Groonga::Array.create(:name => "Comments") comments.define_column("title", "ShortText") comments.define_column("issued", "Time") title = "Good" Modified: groonga/trunk/test/test-hash.rb (+24 -24) =================================================================== --- groonga/trunk/test/test-hash.rb 2010-01-09 14:50:05 +09:00 (rev 913) +++ groonga/trunk/test/test-hash.rb 2010-01-09 15:05:30 +09:00 (rev 914) @@ -21,7 +21,7 @@ def test_delete bookmarks_path = @tables_dir + "bookmarks" - bookmarks = Groonga::Hash.create(:name => "bookmarks", + bookmarks = Groonga::Hash.create(:name => "Bookmarks", :path => bookmarks_path.to_s) groonga = bookmarks.add("groonga") @@ -44,9 +44,9 @@ value = "groonga" value_type = Groonga::Type.new("Text#{value.size}", :size => value.size) bookmarks_path = @tables_dir + "bookmarks" - bookmarks = Groonga::Hash.create(:name => "bookmarks", + bookmarks = Groonga::Hash.create(:name => "Bookmarks", :path => bookmarks_path.to_s, - :key_type => "", + :key_type => "ShortText", :value_type => value_type) bookmarks["http://google.com/"] = value assert_equal(value, bookmarks["http://google.com/"]) @@ -56,7 +56,7 @@ bookmarks_path = @tables_dir + "bookmarks" bookmarks = Groonga::Hash.create(:name => "bookmarks", :path => bookmarks_path.to_s, - :key_type => "") + :key_type => "ShortText") bookmark = bookmarks.add("http://google.com/") assert_equal(bookmark, bookmarks.find("http://google.com/")) end @@ -93,10 +93,10 @@ def test_inspect_named path = @tables_dir + "named.groonga" - named_table = Groonga::Hash.create(:name => "name", :path => path.to_s) + named_table = Groonga::Hash.create(:name => "Users", :path => path.to_s) assert_equal("#, " + - "name: , " + + "name: , " + "path: <#{path}>, " + "domain: , " + "range: , " + @@ -134,11 +134,11 @@ end def test_search - users = Groonga::Array.create(:name => "") - user_name = users.define_column("name", "") + users = Groonga::Array.create(:name => "Users") + user_name = users.define_column("name", "ShortText") - bookmarks = Groonga::Hash.create(:name => "", - :key_type => "") + bookmarks = Groonga::Hash.create(:name => "Bookmarks", + :key_type => "ShortText") bookmark_user_id = bookmarks.define_column("user_id", users) daijiro = users.add @@ -155,33 +155,33 @@ end def test_add - users = Groonga::Hash.create(:name => "") - users.define_column("address", "") + users = Groonga::Hash.create(:name => "Users") + users.define_column("address", "Text") me = users.add("me", :address => "me at example.com") assert_equal("me at example.com", me[:address]) end def test_default_tokenizer_on_create - terms = Groonga::Hash.create(:name => "", - :default_tokenizer => "") + terms = Groonga::Hash.create(:name => "Terms", + :default_tokenizer => "TokenTrigram") assert_equal(context[Groonga::Type::TRIGRAM], terms.default_tokenizer) end def test_duplicated_name - Groonga::Hash.create(:name => "") + Groonga::Hash.create(:name => "Users") assert_raise(Groonga::InvalidArgument) do - Groonga::Hash.create(:name => "") + Groonga::Hash.create(:name => "Users") end end def test_define_index_column_implicit_with_position - bookmarks = Groonga::Hash.create(:name => "") - bookmarks.define_column("comment", "") - terms = Groonga::Hash.create(:name => "", - :default_tokenizer => "") + bookmarks = Groonga::Hash.create(:name => "Bookmarks") + bookmarks.define_column("comment", "Text") + terms = Groonga::Hash.create(:name => "Terms", + :default_tokenizer => "TokenBigram") index = terms.define_index_column("comment", bookmarks, - :source => ".comment") + :source => "Bookmarks.comment") groonga = bookmarks.add("groonga", :comment => "search engine by Brazil") google = bookmarks.add("google", :comment => "search engine by Google") ruby = bookmarks.add("ruby", :comment => "programing language") @@ -191,14 +191,14 @@ end def test_open_same_name - users_created = Groonga::Hash.create(:name => "") - users_opened = Groonga::Hash.open(:name => "") + users_created = Groonga::Hash.create(:name => "Users") + users_opened = Groonga::Hash.open(:name => "Users") users_opened.add("morita") assert_equal(1, users_created.size) end def test_has_key? - users = Groonga::Hash.create(:name => "") + users = Groonga::Hash.create(:name => "Users") assert_false(users.has_key?("morita")) users.add("morita") assert_true(users.has_key?("morita")) From null at cozmixng.org Sat Jan 9 01:05:32 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 15:05:32 +0900 Subject: [groonga-commit:869] groonga [groonga (trunk) r915] * use the current groonga type name. Message-ID: <20100109060532.2AC3C1D1CE9@mail.cozmixng.org> retro 2010-01-09 15:05:31 +0900 (Sat, 09 Jan 2010) New Revision: 915 Log: * use the current groonga type name. Modified files: groonga/trunk/test/test-index-column.rb groonga/trunk/test/test-patricia-trie.rb Modified: groonga/trunk/test/test-index-column.rb (+9 -9) =================================================================== --- groonga/trunk/test/test-index-column.rb 2010-01-09 14:53:38 +09:00 (rev 914) +++ groonga/trunk/test/test-index-column.rb 2010-01-09 15:05:31 +09:00 (rev 915) @@ -23,11 +23,11 @@ end def test_array_set_with_record - articles = Groonga::Array.create(:name => "") - articles.define_column("content", "") + articles = Groonga::Array.create(:name => "Articles") + articles.define_column("content", "Text") - terms = Groonga::Hash.create(:name => "", - :default_tokenizer => "") + terms = Groonga::Hash.create(:name => "Terms", + :default_tokenizer => "TokenBigram") content_index = terms.define_index_column("content", articles, :with_section => true) @@ -56,13 +56,13 @@ end def test_shorter_query_than_ngram - articles = Groonga::Array.create(:name => "") - articles.define_column("content", "") + articles = Groonga::Array.create(:name => "Articles") + articles.define_column("content", "Text") - terms = Groonga::PatriciaTrie.create(:name => "", - :default_tokenizer => "") + terms = Groonga::PatriciaTrie.create(:name => "Terms", + :default_tokenizer => "TokenBigram") content_index = terms.define_index_column("content", articles, - :source => ".content") + :source => "Articles.content") articles.add(:content => 'l') articles.add(:content => 'll') articles.add(:content => 'hello') Modified: groonga/trunk/test/test-patricia-trie.rb (+14 -14) =================================================================== --- groonga/trunk/test/test-patricia-trie.rb 2010-01-09 14:53:38 +09:00 (rev 914) +++ groonga/trunk/test/test-patricia-trie.rb 2010-01-09 15:05:31 +09:00 (rev 915) @@ -27,17 +27,17 @@ def test_tokenizer trie = Groonga::PatriciaTrie.create assert_nil(trie.default_tokenizer) - trie.default_tokenizer = "" - assert_equal(Groonga::Context.default[""], + trie.default_tokenizer = "TokenTrigram" + assert_equal(Groonga::Context.default["TokenTrigram"], trie.default_tokenizer) end def test_search - users = Groonga::Array.create(:name => "") - user_name = users.define_column("name", "") + users = Groonga::Array.create(:name => "Users") + user_name = users.define_column("name", "ShortText") - bookmarks = Groonga::PatriciaTrie.create(:name => "", - :key_type => "") + bookmarks = Groonga::PatriciaTrie.create(:name => "Bookmarks", + :key_type => "ShortText") bookmark_user_id = bookmarks.define_column("user_id", users) daijiro = users.add @@ -54,35 +54,35 @@ end def test_add - users = Groonga::PatriciaTrie.create(:name => "") + users = Groonga::PatriciaTrie.create(:name => "Users") users.define_column("address", "") me = users.add("me", :address => "me at example.com") assert_equal("me at example.com", me[:address]) end def test_default_tokenizer_on_create - terms = Groonga::PatriciaTrie.create(:name => "", - :default_tokenizer => "") + terms = Groonga::PatriciaTrie.create(:name => "Terms", + :default_tokenizer => "TokenUnigram") assert_equal(context[Groonga::Type::UNIGRAM], terms.default_tokenizer) end def test_duplicated_name - Groonga::PatriciaTrie.create(:name => "") + Groonga::PatriciaTrie.create(:name => "Users") assert_raise(Groonga::InvalidArgument) do - Groonga::PatriciaTrie.create(:name => "") + Groonga::PatriciaTrie.create(:name => "Users") end end def test_open_same_name - users_created = Groonga::PatriciaTrie.create(:name => "") - users_opened = Groonga::PatriciaTrie.open(:name => "") + users_created = Groonga::PatriciaTrie.create(:name => "Users") + users_opened = Groonga::PatriciaTrie.open(:name => "Users") users_opened.add("morita") assert_equal(1, users_created.size) end def test_has_key? - users = Groonga::PatriciaTrie.create(:name => "") + users = Groonga::PatriciaTrie.create(:name => "Users") assert_false(users.has_key?("morita")) users.add("morita") assert_true(users.has_key?("morita")) From null at cozmixng.org Sat Jan 9 01:20:24 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 15:20:24 +0900 Subject: [groonga-commit:870] groonga [groonga (trunk) r916] * use the current groonga type name. Message-ID: <20100109062024.BAB5C1D1CE5@mail.cozmixng.org> retro 2010-01-09 15:20:24 +0900 (Sat, 09 Jan 2010) New Revision: 916 Log: * use the current groonga type name. Modified files: groonga/trunk/test/test-record.rb groonga/trunk/test/test-schema.rb Modified: groonga/trunk/test/test-schema.rb (+112 -112) =================================================================== --- groonga/trunk/test/test-schema.rb 2010-01-09 14:56:02 +09:00 (rev 915) +++ groonga/trunk/test/test-schema.rb 2010-01-09 15:20:24 +09:00 (rev 916) @@ -19,57 +19,57 @@ setup :setup_database def test_create_table - assert_nil(context[""]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Posts"]) + Groonga::Schema.create_table("Posts") do |table| end - assert_not_nil(context[""]) + assert_not_nil(context["Posts"]) end def test_create_table_force - Groonga::Schema.create_table("posts") do |table| + Groonga::Schema.create_table("Posts") do |table| table.string("name") end - assert_not_nil(context["posts.name"]) + assert_not_nil(context["Posts.name"]) - Groonga::Schema.create_table("posts") do |table| + Groonga::Schema.create_table("Posts") do |table| end - assert_not_nil(context["posts.name"]) + assert_not_nil(context["Posts.name"]) - Groonga::Schema.create_table("posts", :force => true) do |table| + Groonga::Schema.create_table("Posts", :force => true) do |table| end - assert_nil(context["posts.name"]) + assert_nil(context["Posts.name"]) end def test_remove_table - Groonga::Array.create(:name => "posts") - assert_not_nil(context["posts"]) - Groonga::Schema.remove_table("posts") - assert_nil(context["posts"]) + Groonga::Array.create(:name => "Posts") + assert_not_nil(context["Posts"]) + Groonga::Schema.remove_table("Posts") + assert_nil(context["Posts"]) end def test_define_hash - Groonga::Schema.create_table("", :type => :hash) do |table| + Groonga::Schema.create_table("Posts", :type => :hash) do |table| end - assert_kind_of(Groonga::Hash, context[""]) + assert_kind_of(Groonga::Hash, context["Posts"]) end def test_define_hash_with_full_option path = @tmp_dir + "hash.groonga" - tokenizer = context[""] + tokenizer = context["TokenTrigram"] type = Groonga::Type.new("Niku", :size => 29) - Groonga::Schema.create_table("", + Groonga::Schema.create_table("Posts", :type => :hash, :key_type => "integer", :path => path.to_s, :value_type => type, :default_tokenizer => tokenizer) do |table| end - table = context[""] + table = context["Posts"] assert_equal("#, " + - "name: <>, " + + "name: , " + "path: <#{path}>, " + - "domain: <#{context[''].inspect}>, " + + "domain: <#{context['Int32'].inspect}>, " + "range: <#{type.inspect}>, " + "flags: <>, " + "encoding: <#{Groonga::Encoding.default.inspect}>, " + @@ -79,27 +79,27 @@ end def test_define_patricia_trie - Groonga::Schema.create_table("", :type => :patricia_trie) do |table| + Groonga::Schema.create_table("Posts", :type => :patricia_trie) do |table| end - assert_kind_of(Groonga::PatriciaTrie, context[""]) + assert_kind_of(Groonga::PatriciaTrie, context["Posts"]) end def test_define_patricia_trie_with_full_option path = @tmp_dir + "patricia-trie.groonga" type = Groonga::Type.new("Niku", :size => 29) - Groonga::Schema.create_table("", + Groonga::Schema.create_table("Posts", :type => :patricia_trie, :key_type => "integer", :path => path.to_s, :value_type => type, - :default_tokenizer => "", + :default_tokenizer => "TokenBigram", :key_normalize => true, :key_with_sis => true) do |table| end - table = context[""] + table = context["Posts"] assert_equal("#, " + - "name: <>, " + + "name: , " + "path: <#{path}>, " + "domain: <#{context[''].inspect}>, " + "range: <#{type.inspect}>, " + @@ -107,27 +107,27 @@ "encoding: <#{Groonga::Encoding.default.inspect}>, " + "size: <0>>", table.inspect) - assert_equal(context[""], table.default_tokenizer) + assert_equal(context["TokenBigram"], table.default_tokenizer) end def test_define_array - Groonga::Schema.create_table("", :type => :array) do |table| + Groonga::Schema.create_table("Posts", :type => :array) do |table| end - assert_kind_of(Groonga::Array, context[""]) + assert_kind_of(Groonga::Array, context["Posts"]) end def test_define_array_with_full_option path = @tmp_dir + "array.groonga" type = Groonga::Type.new("Niku", :size => 29) - Groonga::Schema.create_table("", + Groonga::Schema.create_table("Posts", :type => :array, :path => path.to_s, :value_type => type) do |table| end - table = context[""] + table = context["Posts"] assert_equal("#, " + - "name: <>, " + + "name: , " + "path: <#{path}>, " + "domain: <#{type.inspect}>, " + "range: <#{type.inspect}>, " + @@ -139,7 +139,7 @@ def test_column_with_full_option path = @tmp_dir + "column.groonga" type = Groonga::Type.new("Niku", :size => 29) - Groonga::Schema.create_table("") do |table| + Groonga::Schema.create_table("Posts") do |table| table.column("rate", type, :path => path, @@ -148,8 +148,8 @@ :compress => :lzo) end - table = context[""] - column_name = ".rate" + table = context["Posts"] + column_name = "Posts.rate" column = context[column_name] assert_equal("#, " + @@ -162,135 +162,135 @@ end def test_integer32_column - assert_nil(context[".rate"]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Posts.rate"]) + Groonga::Schema.create_table("Posts") do |table| table.integer32 :rate end - assert_equal(context[""], context[".rate"].range) + assert_equal(context["Int32"], context["Posts.rate"].range) end def test_integer64_column - assert_nil(context[".rate"]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Posts.rate"]) + Groonga::Schema.create_table("Posts") do |table| table.integer64 :rate end - assert_equal(context[""], context[".rate"].range) + assert_equal(context["Int64"], context["Posts.rate"].range) end def test_unsigned_integer32_column - assert_nil(context[".n_viewed"]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Posts.n_viewed"]) + Groonga::Schema.create_table("Posts") do |table| table.unsigned_integer32 :n_viewed end - assert_equal(context[""], context[".n_viewed"].range) + assert_equal(context["UInt32"], context["Posts.n_viewed"].range) end def test_unsigned_integer64_column - assert_nil(context[".n_viewed"]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Posts.n_viewed"]) + Groonga::Schema.create_table("Posts") do |table| table.unsigned_integer64 :n_viewed end - assert_equal(context[""], context[".n_viewed"].range) + assert_equal(context["UInt64"], context["Posts.n_viewed"].range) end def test_float_column - assert_nil(context[".rate"]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Posts.rate"]) + Groonga::Schema.create_table("Posts") do |table| table.float :rate end - assert_equal(context[""], context[".rate"].range) + assert_equal(context["Float"], context["Posts.rate"].range) end def test_time_column - assert_nil(context[".last_modified"]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Posts.last_modified"]) + Groonga::Schema.create_table("Posts") do |table| table.time :last_modified end - assert_equal(context[""], context[".last_modified"].range) + assert_equal(context["Time"], context["Posts.last_modified"].range) end def test_short_text_column - assert_nil(context[".title"]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Posts.title"]) + Groonga::Schema.create_table("Posts") do |table| table.short_text :title end - assert_equal(context[""], context[".title"].range) + assert_equal(context["ShortText"], context["Posts.title"].range) end def test_text_column - assert_nil(context[".comment"]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Posts.comment"]) + Groonga::Schema.create_table("Posts") do |table| table.text :comment end - assert_equal(context[""], context[".comment"].range) + assert_equal(context["Text"], context["Posts.comment"].range) end def test_long_text_column - assert_nil(context[".content"]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Posts.content"]) + Groonga::Schema.create_table("Posts") do |table| table.long_text :content end - assert_equal(context[""], context[".content"].range) + assert_equal(context["LongText"], context["Posts.content"].range) end def test_remove_column - Groonga::Schema.create_table("posts") do |table| + Groonga::Schema.create_table("Posts") do |table| table.long_text :content end - assert_not_nil(context["posts.content"]) + assert_not_nil(context["Posts.content"]) - Groonga::Schema.change_table("posts") do |table| + Groonga::Schema.change_table("Posts") do |table| table.remove_column("content") end - assert_nil(context["posts.content"]) + assert_nil(context["Posts.content"]) end def test_column_again - Groonga::Schema.create_table("posts") do |table| + Groonga::Schema.create_table("Posts") do |table| table.text :content end assert_nothing_raised do - Groonga::Schema.create_table("posts") do |table| + Groonga::Schema.create_table("Posts") do |table| table.text :content end end end def test_column_again_with_difference_type - Groonga::Schema.create_table("posts") do |table| + Groonga::Schema.create_table("Posts") do |table| table.text :content end assert_raise(ArgumentError) do - Groonga::Schema.create_table("posts") do |table| + Groonga::Schema.create_table("Posts") do |table| table.integer :content end end end def test_index - assert_nil(context[".content"]) - Groonga::Schema.create_table("") do |table| + assert_nil(context["Terms.content"]) + Groonga::Schema.create_table("Posts") do |table| table.long_text :content end - Groonga::Schema.create_table("") do |table| - table.index ".content" + Groonga::Schema.create_table("Terms") do |table| + table.index "Posts.content" end - assert_equal([context[".content"]], - context["._content"].sources) + assert_equal([context["Posts.content"]], + context["Terms.Posts_content"].sources) end def test_index_with_full_option path = @tmp_dir + "index-column.groonga" - assert_nil(context[".content"]) - index_column_name = "posts-index" + assert_nil(context["Terms.content"]) + index_column_name = "Posts-index" - Groonga::Schema.create_table("") do |table| + Groonga::Schema.create_table("Posts") do |table| table.long_text :content end - Groonga::Schema.create_table("") do |table| - table.index(".content", + Groonga::Schema.create_table("Terms") do |table| + table.index("Posts.content", :name => index_column_name, :path => path, :persistent => true, @@ -299,9 +299,9 @@ :with_position => true) end - posts = context[""] - terms = context[""] - full_index_column_name = ".#{index_column_name}" + posts = context["Posts"] + terms = context["Terms"] + full_index_column_name = "Terms.#{index_column_name}" index_column = context[full_index_column_name] assert_equal("#, " + @@ -316,44 +316,44 @@ end def test_index_again - Groonga::Schema.create_table("posts") do |table| + Groonga::Schema.create_table("Posts") do |table| table.long_text :content end - Groonga::Schema.create_table("terms") do |table| - table.index "posts.content" + Groonga::Schema.create_table("Terms") do |table| + table.index "Posts.content" end assert_nothing_raised do - Groonga::Schema.create_table("terms") do |table| - table.index "posts.content" + Groonga::Schema.create_table("Terms") do |table| + table.index "Posts.content" end end end def test_index_again_with_difference_source - Groonga::Schema.create_table("posts") do |table| + Groonga::Schema.create_table("Posts") do |table| table.long_text :content table.short_text :name end - Groonga::Schema.create_table("terms") do |table| - table.index "posts.content" + Groonga::Schema.create_table("Terms") do |table| + table.index "Posts.content" end assert_raise(ArgumentError) do - Groonga::Schema.create_table("terms") do |table| - table.index "posts.name", :name => "posts_content" + Groonga::Schema.create_table("Terms") do |table| + table.index "Posts.name", :name => "Posts_content" end end end def test_dump Groonga::Schema.define do |schema| - schema.create_table("posts") do |table| + schema.create_table("Posts") do |table| table.short_text :title end end assert_equal(<<-EOS, Groonga::Schema.dump) -create_table("posts") do |table| +create_table("Posts") do |table| table.short_text("title") end EOS @@ -361,39 +361,39 @@ def test_reference_dump Groonga::Schema.define do |schema| - schema.create_table("items") do |table| + schema.create_table("Items") do |table| table.short_text("title") end - schema.create_table("users") do |table| + schema.create_table("Users") do |table| table.short_text("name") end - schema.create_table("comments") do |table| - table.reference("item", "items") - table.reference("author", "users") + schema.create_table("Comments") do |table| + table.reference("item", "Items") + table.reference("author", "Users") table.text("content") table.time("issued") end end assert_equal(<<-EOS, Groonga::Schema.dump) -create_table("comments") do |table| +create_table("Comments") do |table| table.text("content") table.time("issued") end -create_table("items") do |table| +create_table("Items") do |table| table.short_text("title") end -create_table("users") do |table| +create_table("Users") do |table| table.short_text("name") end -change_table("comments") do |table| - table.reference("author", "users") - table.reference("item", "items") +change_table("Comments") do |table| + table.reference("author", "Users") + table.reference("item", "Items") end EOS end @@ -403,18 +403,18 @@ Groonga::Context.default = nil Groonga::Schema.define(:context => context) do |schema| - schema.create_table('items', :type => :hash) do |table| + schema.create_table('Items', :type => :hash) do |table| table.text("text") end - schema.create_table("terms_text", + schema.create_table("TermsText", :type => :patricia_trie, :key_normalize => true, :default_tokenizer => "TokenBigram") do |table| - table.index('items.text') + table.index('Items.text') end end - assert_not_nil(context["items.text"]) - assert_not_nil(context["terms_text.items_text"]) + assert_not_nil(context["Items.text"]) + assert_not_nil(context["TermsText.Items_text"]) end end Modified: groonga/trunk/test/test-record.rb (+12 -12) =================================================================== --- groonga/trunk/test/test-record.rb 2010-01-09 14:56:02 +09:00 (rev 915) +++ groonga/trunk/test/test-record.rb 2010-01-09 15:20:24 +09:00 (rev 916) @@ -27,23 +27,23 @@ def setup_addresses_table @addresses_path = @tables_dir + "addresses" - @addresses = Groonga::Array.create(:name => "addresses", + @addresses = Groonga::Array.create(:name => "Addresses", :path => @addresses_path.to_s) @addresses_mail_column_path = @columns_dir + "mail" @addresses_mail_column = - @addresses.define_column("mail", "", + @addresses.define_column("mail", "ShortText", :path => @addresses_mail_column_path.to_s) end def setup_users_table @users_path = @tables_dir + "users" - @users = Groonga::Array.create(:name => "users", + @users = Groonga::Array.create(:name => "Users", :path => @users_path.to_s) @users_name_column_path = @columns_dir + "name" @users_name_column = - @users.define_column("name", "", + @users.define_column("name", "ShortText", :path => @users_name_column_path.to_s) @users_addresses_column_path = @columns_dir + "addresses" @@ -56,25 +56,25 @@ def setup_bookmarks_table @bookmarks_path = @tables_dir + "bookmarks" value_type = Groonga::Type.new("Text512", :size => 512) - @bookmarks = Groonga::Array.create(:name => "bookmarks", + @bookmarks = Groonga::Array.create(:name => "Bookmarks", :value_type => value_type, :path => @bookmarks_path.to_s) @uri_column_path = @columns_dir + "uri" - @bookmarks_uri = @bookmarks.define_column("uri", "", + @bookmarks_uri = @bookmarks.define_column("uri", "ShortText", :path => @uri_column_path.to_s) @rate_column_path = @columns_dir + "rate" - @bookmarks_rate = @bookmarks.define_column("rate", "", + @bookmarks_rate = @bookmarks.define_column("rate", "Int32", :path => @rate_column_path.to_s) @comment_column_path = @columns_dir + "comment" @bookmarks_comment = - @bookmarks.define_column("comment", "", + @bookmarks.define_column("comment", "Text", :path => @comment_column_path.to_s) @content_column_path = @columns_dir + "content" - @bookmarks_content = @bookmarks.define_column("content", "") + @bookmarks_content = @bookmarks.define_column("content", "LongText") @user_column_path = @columns_dir + "user" @bookmarks_user = @bookmarks.define_column("user", @users) @@ -83,7 +83,7 @@ def setup_indexes @bookmarks_index_path = @tables_dir + "bookmarks-index" @bookmarks_index = - Groonga::PatriciaTrie.create(:name => "bookmarks-index", + Groonga::PatriciaTrie.create(:name => "BookmarksIndex", :path => @bookmarks_index_path.to_s) @bookmarks_index.default_tokenizer = "TokenBigram" @@ -160,8 +160,8 @@ end def test_key - documents = Groonga::PatriciaTrie.create(:name => "", - :key_type => "") + documents = Groonga::PatriciaTrie.create(:name => "Documents", + :key_type => "ShortText") reference = documents.add("reference") assert_equal("reference", reference.key) end From null at cozmixng.org Sat Jan 9 01:35:36 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 15:35:36 +0900 Subject: [groonga-commit:871] groonga [groonga (trunk) r917] * use the current groonga type name. Message-ID: <20100109063536.D9E211D1CE5@mail.cozmixng.org> retro 2010-01-09 15:35:36 +0900 (Sat, 09 Jan 2010) New Revision: 917 Log: * use the current groonga type name. Modified files: groonga/trunk/test/test-table-cursor.rb groonga/trunk/test/test-table-select-normalize.rb groonga/trunk/test/test-table-select.rb groonga/trunk/test/test-table.rb Modified: groonga/trunk/test/test-table-select.rb (+2 -2) =================================================================== --- groonga/trunk/test/test-table-select.rb 2010-01-09 15:11:28 +09:00 (rev 916) +++ groonga/trunk/test/test-table-select.rb 2010-01-09 15:35:36 +09:00 (rev 917) @@ -21,10 +21,10 @@ setup def setup_comments - @comments = Groonga::Array.create(:name => "comments") + @comments = Groonga::Array.create(:name => "Comments") @comments.define_column("content", "Text") @comments.define_column("created_at", "Time") - terms = Groonga::PatriciaTrie.create(:name => "terms", + terms = Groonga::PatriciaTrie.create(:name => "Terms", :default_tokenizer => "TokenBigram") terms.define_index_column("comment_content", @comments, :with_section => true, Modified: groonga/trunk/test/test-table-select-normalize.rb (+3 -3) =================================================================== --- groonga/trunk/test/test-table-select-normalize.rb 2010-01-09 15:11:28 +09:00 (rev 916) +++ groonga/trunk/test/test-table-select-normalize.rb 2010-01-09 15:35:36 +09:00 (rev 917) @@ -22,15 +22,15 @@ setup def setup_comments - @comments = Groonga::Array.create(:name => "comments") + @comments = Groonga::Array.create(:name => "Comments") @comments.define_column("content", "Text") @comments.define_column("created_at", "Time") - terms = Groonga::PatriciaTrie.create(:name => "terms", + 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") + :source => "Comments.content") @japanese_comment = @comments.add(:content => "?????TV???????", :created_at => Time.parse("2009-06-09")) Modified: groonga/trunk/test/test-table.rb (+67 -67) =================================================================== --- groonga/trunk/test/test-table.rb 2010-01-09 15:11:28 +09:00 (rev 916) +++ groonga/trunk/test/test-table.rb 2010-01-09 15:35:36 +09:00 (rev 917) @@ -19,11 +19,11 @@ setup :setup_database def test_create - table_path = @tables_dir + "table" + table_path = @tables_dir + "bookmarks" assert_not_predicate(table_path, :exist?) - table = Groonga::PatriciaTrie.create(:name => "bookmarks", + table = Groonga::PatriciaTrie.create(:name => "Bookmarks", :path => table_path.to_s) - assert_equal("bookmarks", table.name) + assert_equal("Bookmarks", table.name) assert_predicate(table_path, :exist?) end @@ -34,16 +34,16 @@ end def test_open - table_path = @tables_dir + "table" - table = Groonga::Hash.create(:name => "bookmarks", + table_path = @tables_dir + "bookmarks" + table = Groonga::Hash.create(:name => "Bookmarks", :path => table_path.to_s) - assert_equal("bookmarks", table.name) + assert_equal("Bookmarks", table.name) called = false - Groonga::Table.open(:name => "bookmarks") do |_table| + Groonga::Table.open(:name => "Bookmarks") do |_table| table = _table assert_not_predicate(table, :closed?) - assert_equal("bookmarks", _table.name) + assert_equal("Bookmarks", _table.name) called = true end assert_true(called) @@ -51,10 +51,10 @@ end def test_open_by_path - table_path = @tables_dir + "table" - table = Groonga::PatriciaTrie.create(:name => "bookmarks", + table_path = @tables_dir + "bookmarks" + table = Groonga::PatriciaTrie.create(:name => "Bookmarks", :path => table_path.to_s) - assert_equal("bookmarks", table.name) + assert_equal("Bookmarks", table.name) table.close called = false @@ -69,17 +69,17 @@ end def test_open_override_name - table_path = @tables_dir + "table" - table = Groonga::PatriciaTrie.create(:name => "bookmarks", + table_path = @tables_dir + "bookmarks" + table = Groonga::PatriciaTrie.create(:name => "Bookmarks", :path => table_path.to_s) - assert_equal("bookmarks", table.name) + assert_equal("Bookmarks", table.name) table.close called = false - Groonga::Table.open(:name => "no-name", :path => table_path.to_s) do |_table| + Groonga::Table.open(:name => "Marks", :path => table_path.to_s) do |_table| table = _table assert_not_predicate(table, :closed?) - assert_equal("no-name", _table.name) + assert_equal("Marks", _table.name) called = true end assert_true(called) @@ -87,19 +87,19 @@ end def test_open_wrong_table - table_path = @tables_dir + "table" - Groonga::Hash.create(:name => "bookmarks", + table_path = @tables_dir + "bookmarks" + Groonga::Hash.create(:name => "Bookmarks", :path => table_path.to_s) do end assert_raise(TypeError) do - Groonga::PatriciaTrie.open(:name => "bookmarks", + Groonga::PatriciaTrie.open(:name => "Bookmarks", :path => table_path.to_s) end end def test_new - table_path = @tables_dir + "table" + table_path = @tables_dir + "no-name" assert_raise(Groonga::NoSuchFileOrDirectory) do Groonga::Hash.new(:path => table_path.to_s) end @@ -109,42 +109,42 @@ end def test_define_column - table_path = @tables_dir + "table" - table = Groonga::Hash.create(:name => "bookmarks", + table_path = @tables_dir + "bookmarks" + table = Groonga::Hash.create(:name => "Bookmarks", :path => table_path.to_s) - column = table.define_column("name", "") - assert_equal("bookmarks.name", column.name) + column = table.define_column("name", "Text") + assert_equal("Bookmarks.name", column.name) assert_equal(column, table.column("name")) end def test_define_index_column - bookmarks = Groonga::Hash.create(:name => "") - bookmarks.define_column("content", "") - terms = Groonga::Hash.create(:name => "") - terms.default_tokenizer = "" + bookmarks = Groonga::Hash.create(:name => "Bookmarks") + bookmarks.define_column("content", "Text") + terms = Groonga::Hash.create(:name => "Terms") + terms.default_tokenizer = "TokenBigram" index = terms.define_index_column("content-index", bookmarks, :with_section => true, - :source => ".content") + :source => "Bookmarks.content") bookmarks.add("google", :content => "Search engine") assert_equal(["google"], index.search("engine").collect {|record| record.key.key}) end def test_add_column - bookmarks = Groonga::Hash.create(:name => "bookmarks", + bookmarks = Groonga::Hash.create(:name => "Bookmarks", :path => (@tables_dir + "bookmarks").to_s) description_column_path = @columns_dir + "description" bookmarks_description = - bookmarks.define_index_column("description", "", + bookmarks.define_index_column("description", "Text", :path => description_column_path.to_s) - books = Groonga::Hash.create(:name => "books", + books = Groonga::Hash.create(:name => "Books", :path => (@tables_dir + "books").to_s) books_description = books.add_column("description", - "", + "LongText", description_column_path.to_s) - assert_equal("books.description", books_description.name) + assert_equal("Books.description", books_description.name) assert_equal(books_description, books.column("description")) assert_equal(bookmarks_description, bookmarks.column("description")) @@ -152,7 +152,7 @@ def test_column_nonexistent table_path = @tables_dir + "bookmarks" - table = Groonga::Hash.create(:name => "bookmarks", + table = Groonga::Hash.create(:name => "Bookmarks", :path => table_path.to_s) assert_nil(table.column("nonexistent")) end @@ -160,12 +160,12 @@ def test_set_value value_type = Groonga::Type.new("Text512", :size => 512) table_path = @tables_dir + "bookmarks" - bookmarks = Groonga::Hash.create(:name => "bookmarks", + bookmarks = Groonga::Hash.create(:name => "Bookmarks", :value_type => value_type, :path => table_path.to_s) comment_column_path = @columns_dir + "comment" bookmarks_comment = - bookmarks.define_column("comment", "", + bookmarks.define_column("comment", "ShortText", :type => "scalar", :path => comment_column_path.to_s) groonga = bookmarks.add("groonga") @@ -180,7 +180,7 @@ def test_array_set value_type = Groonga::Type.new("Text512", :size => 512) - bookmarks = Groonga::Hash.create(:name => "bookmarks", + bookmarks = Groonga::Hash.create(:name => "Bookmarks", :value_type => value_type) url = "http://groonga.org/" bookmarks["groonga"] = "#{url}\0" @@ -193,10 +193,10 @@ def test_add_without_name users_path = @tables_dir + "users" - users = Groonga::Array.create(:name => "users", + users = Groonga::Array.create(:name => "Users", :path => users_path.to_s) name_column_path = @columns_dir + "name" - users_name = users.define_column("name", "", + users_name = users.define_column("name", "ShortText", :path => name_column_path.to_s) morita = users.add users_name[morita.id] = "morita" @@ -205,12 +205,12 @@ def test_add_by_id users_path = @tables_dir + "users" - users = Groonga::Hash.create(:name => "users", + users = Groonga::Hash.create(:name => "Users", :path => users_path.to_s) value_type = Groonga::Type.new("Text512", :size => 512) bookmarks_path = @tables_dir + "bookmarks" - bookmarks = Groonga::Hash.create(:name => "bookmarks", + bookmarks = Groonga::Hash.create(:name => "Bookmarks", :key_type => users, :value_type => value_type, :path => bookmarks_path.to_s) @@ -224,18 +224,18 @@ def test_columns bookmarks_path = @tables_dir + "bookmarks" - bookmarks = Groonga::Array.create(:name => "bookmarks", + bookmarks = Groonga::Array.create(:name => "Bookmarks", :path => bookmarks_path.to_s) - uri_column = bookmarks.define_column("uri", "") - comment_column = bookmarks.define_column("comment", "") + uri_column = bookmarks.define_column("uri", "ShortText") + comment_column = bookmarks.define_column("comment", "Text") assert_equal([uri_column.name, comment_column.name].sort, bookmarks.columns.collect {|column| column.name}.sort) end def test_column_by_symbol bookmarks_path = @tables_dir + "bookmarks" - bookmarks = Groonga::Array.create(:name => "bookmarks", + bookmarks = Groonga::Array.create(:name => "Bookmarks", :path => bookmarks_path.to_s) uri_column = bookmarks.define_column("uri", "Text") @@ -244,7 +244,7 @@ def test_size bookmarks_path = @tables_dir + "bookmarks" - bookmarks = Groonga::Array.create(:name => "bookmarks", + bookmarks = Groonga::Array.create(:name => "Bookmarks", :path => bookmarks_path.to_s) assert_equal(0, bookmarks.size) @@ -258,9 +258,9 @@ def test_time_column bookmarks_path = @tables_dir + "bookmarks" - bookmarks = Groonga::Array.create(:name => "bookmarks", + bookmarks = Groonga::Array.create(:name => "Bookmarks", :path => bookmarks_path.to_s) - column = bookmarks.define_column("created_at", "") + column = bookmarks.define_column("created_at", "Time") bookmark = bookmarks.add now = Time.now @@ -271,7 +271,7 @@ def test_delete bookmarks_path = @tables_dir + "bookmarks" - bookmarks = Groonga::Array.create(:name => "bookmarks", + bookmarks = Groonga::Array.create(:name => "Bookmarks", :path => bookmarks_path.to_s) bookmark1 = bookmarks.add @@ -285,7 +285,7 @@ def test_remove bookmarks_path = @tables_dir + "bookmarks" - bookmarks = Groonga::Array.create(:name => "bookmarks", + bookmarks = Groonga::Array.create(:name => "Bookmarks", :path => bookmarks_path.to_s) assert_predicate(bookmarks_path, :exist?) bookmarks.remove @@ -293,15 +293,15 @@ end def test_temporary_add - table = Groonga::Hash.create(:key_type => "") + table = Groonga::Hash.create(:key_type => "ShortText") assert_equal(0, table.size) table.add("key") assert_equal(1, table.size) end def test_each - users = Groonga::Array.create(:name => "") - user_name = users.define_column("name", "") + users = Groonga::Array.create(:name => "Users") + user_name = users.define_column("name", "ShortText") names = ["daijiro", "gunyarakun", "yu"] names.each do |name| @@ -313,7 +313,7 @@ end def test_truncate - users = Groonga::Array.create(:name => "") + users = Groonga::Array.create(:name => "Users") users.add users.add users.add @@ -397,9 +397,9 @@ end def test_group - bookmarks = Groonga::Hash.create(:name => "") - bookmarks.define_column("title", "") - comments = Groonga::Array.create(:name => "") + bookmarks = Groonga::Hash.create(:name => "Bookmarks") + bookmarks.define_column("title", "Text") + comments = Groonga::Array.create(:name => "Comments") comments.define_column("bookmark", bookmarks) comments.define_column("content", "Text") comments.define_column("issued", "Int32") @@ -432,7 +432,7 @@ end def test_union! - bookmarks = Groonga::Hash.create(:name => "bookmarks") + bookmarks = Groonga::Hash.create(:name => "Bookmarks") bookmarks.define_column("title", "ShortText") groonga = bookmarks.add("http://groonga.org/", :title => "groonga") @@ -462,7 +462,7 @@ end def test_difference! - bookmarks = Groonga::Hash.create(:name => "bookmarks") + bookmarks = Groonga::Hash.create(:name => "Bookmarks") bookmarks.define_column("title", "ShortText") bookmarks.add("http://groonga.org/", :title => "groonga") @@ -477,7 +477,7 @@ end def test_merge! - bookmarks = Groonga::Hash.create(:name => "bookmarks") + bookmarks = Groonga::Hash.create(:name => "Bookmarks") bookmarks.define_column("title", "ShortText") bookmarks.add("http://groonga.org/", :title => "groonga") @@ -493,7 +493,7 @@ end def test_lock - bookmarks = Groonga::Array.create(:name => "") + bookmarks = Groonga::Array.create(:name => "Bookmarks") bookmark = bookmarks.add assert_not_predicate(bookmarks, :locked?) @@ -504,7 +504,7 @@ end def test_lock_failed - bookmarks = Groonga::Array.create(:name => "") + bookmarks = Groonga::Array.create(:name => "Bookmarks") bookmark = bookmarks.add bookmarks.lock @@ -514,7 +514,7 @@ end def test_lock_block - bookmarks = Groonga::Array.create(:name => "") + bookmarks = Groonga::Array.create(:name => "Bookmarks") bookmark = bookmarks.add assert_not_predicate(bookmarks, :locked?) @@ -525,7 +525,7 @@ end def test_clear_lock - bookmarks = Groonga::Array.create(:name => "") + bookmarks = Groonga::Array.create(:name => "Bookmarks") bookmark = bookmarks.add assert_not_predicate(bookmarks, :locked?) @@ -550,8 +550,8 @@ private def create_bookmarks - bookmarks = Groonga::Array.create(:name => "") - bookmarks.define_column("id", "") + bookmarks = Groonga::Array.create(:name => "Bookmarks") + bookmarks.define_column("id", "Int32") bookmarks end Modified: groonga/trunk/test/test-table-cursor.rb (+44 -49) =================================================================== --- groonga/trunk/test/test-table-cursor.rb 2010-01-09 15:11:28 +09:00 (rev 916) +++ groonga/trunk/test/test-table-cursor.rb 2010-01-09 15:35:36 +09:00 (rev 917) @@ -20,7 +20,7 @@ setup_database @bookmarks_path = @tables_dir + "table" - @bookmarks = Groonga::PatriciaTrie.create(:name => "bookmarks", + @bookmarks = Groonga::PatriciaTrie.create(:name => "Bookmarks", :path => @bookmarks_path.to_s) @groonga_bookmark = @bookmarks.add("groonga") @cutter_bookmark = @bookmarks.add("Cutter") @@ -50,62 +50,66 @@ end def test_without_limit_and_offset - bookmarks = create_bookmarks - add_ids(bookmarks) + users = create_users + add_users(users) results = [] - bookmarks.open_cursor do |cursor| + users.open_cursor do |cursor| cursor.each do |record| - results << record["id"] + results << record["name"] end end - assert_equal((100..199).to_a, results) + assert_equal((100..199).collect {|i| "user#{i}"}, + results) end def test_with_limit - bookmarks = create_bookmarks - add_ids(bookmarks) + users = create_users + add_users(users) results = [] - bookmarks.open_cursor(:limit => 20) do |cursor| + users.open_cursor(:limit => 20) do |cursor| cursor.each do |record| - results << record["id"] + results << record["name"] end end - assert_equal((100...120).to_a, results) + assert_equal((100...120).collect {|i| "user#{i}"}, + results) end def test_with_offset - bookmarks = create_bookmarks - add_ids(bookmarks) + users = create_users + add_users(users) results = [] - bookmarks.open_cursor(:offset => 20) do |cursor| + users.open_cursor(:offset => 20) do |cursor| cursor.each do |record| - results << record["id"] + results << record["name"] end end - assert_equal((120...200).to_a, results) + assert_equal((120...200).collect {|i| "user#{i}"}, + results) end def test_with_limit_and_offset - bookmarks = create_bookmarks - add_ids(bookmarks) + users = create_users + add_users(users) results = [] - bookmarks.open_cursor(:limit => 20, :offset => 20) do |cursor| + users.open_cursor(:limit => 20, :offset => 20) do |cursor| cursor.each do |record| - results << record["id"] + results << record["name"] end end - assert_equal((120...140).to_a, results) + assert_equal((120...140).collect {|i| "user#{i}"}, + results) end def test_delete - bookmarks = create_bookmarks - add_ids(bookmarks) + users = create_users + add_users(users) - bookmarks.open_cursor(:limit => 20) do |cursor| + users.open_cursor(:limit => 20) do |cursor| 20.times do cursor.next cursor.delete @@ -113,46 +117,37 @@ end results = [] - bookmarks.open_cursor do |cursor| + users.open_cursor do |cursor| cursor.each do |record| - results << record["id"] + results << record["name"] end end - assert_equal((120...200).to_a, results) + assert_equal((120...200).collect {|i| "user#{i}"}, + results) end def test_patricia_trie_cursor_key - bookmarks = Groonga::PatriciaTrie.create(:name => "patricia_trie_table") - bookmarks.add("test") - bookmarks.open_cursor do |cursor| + sites = Groonga::PatriciaTrie.create(:name => "Sites") + sites.add("http://groonga.org/") + sites.open_cursor do |cursor| cursor.next - assert_equal("test", cursor.key) + assert_equal("http://groonga.org/", cursor.key) end end private - def create_bookmarks - bookmarks = Groonga::Array.create(:name => "") - bookmarks.define_column("id", "") - bookmarks + def create_users + users = Groonga::Array.create(:name => "Users") + users.define_column("name", "ShortText") + users end - def add_ids(bookmarks) + def add_users(users) (0...100).to_a.each do |i| - bookmark = bookmarks.add - bookmark["id"] = i + 100 + user = users.add + user["name"] = "user#{i + 100}" end - bookmarks + users end - - def get_ids_by_cursor(bookmarks, options={}) - ids = [] - bookmarks.open_cursor(options) do |cursor| - cursor.each do |record| - ids << record["id"] - end - end - ids - end end From null at cozmixng.org Sat Jan 9 01:35:38 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 15:35:38 +0900 Subject: [groonga-commit:872] groonga [groonga (trunk) r918] * use the current groonga type name. Message-ID: <20100109063538.D06E91D1CE9@mail.cozmixng.org> retro 2010-01-09 15:35:38 +0900 (Sat, 09 Jan 2010) New Revision: 918 Log: * use the current groonga type name. Modified files: groonga/trunk/test/test-variable-size-column.rb Modified: groonga/trunk/test/test-variable-size-column.rb (+3 -3) =================================================================== --- groonga/trunk/test/test-variable-size-column.rb 2010-01-09 15:26:38 +09:00 (rev 917) +++ groonga/trunk/test/test-variable-size-column.rb 2010-01-09 15:35:38 +09:00 (rev 918) @@ -25,11 +25,11 @@ def setup_users_table @users_path = @tables_dir + "users" - @users = Groonga::Array.create(:name => "users", + @users = Groonga::Array.create(:name => "Users", :path => @users_path.to_s) @users_name_column_path = @columns_dir + "name" - @name = @users.define_column("name", "", + @name = @users.define_column("name", "ShortText", :path => @users_name_column_path.to_s) @users_friends_column_path = @columns_dir + "friends" @@ -53,7 +53,7 @@ def test_inspect assert_equal("#, " + - "name: , " + + "name: , " + "path: <#{@users_name_column_path}>, " + "domain: <#{@users.inspect}>, " + "range: <#{context[''].inspect}>, " + From null at cozmixng.org Sat Jan 9 01:35:41 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 09 Jan 2010 15:35:41 +0900 Subject: [groonga-commit:873] groonga [groonga (trunk) r919] * use the current groonga type name. Message-ID: <20100109063541.B33871D1CEA@mail.cozmixng.org> retro 2010-01-09 15:35:41 +0900 (Sat, 09 Jan 2010) New Revision: 919 Log: * use the current groonga type name. Modified files: groonga/trunk/ext/rb-grn-array.c groonga/trunk/ext/rb-grn-column.c groonga/trunk/ext/rb-grn-hash.c groonga/trunk/ext/rb-grn-patricia-trie.c groonga/trunk/lib/groonga/schema.rb Modified: groonga/trunk/lib/groonga/schema.rb (+4 -4) =================================================================== --- groonga/trunk/lib/groonga/schema.rb 2010-01-09 15:28:20 +09:00 (rev 918) +++ groonga/trunk/lib/groonga/schema.rb 2010-01-09 15:35:41 +09:00 (rev 919) @@ -27,17 +27,17 @@ # ????????????????????????? # # Groonga::Schema.define do |schema| - # schema.create_table("items") do |table| + # schema.create_table("Items") do |table| # table.short_text("title") # end # - # schema.create_table("users") do |table| + # schema.create_table("Users") do |table| # table.short_text("name") # end # # schema.create_table("comments") do |table| - # table.reference("item", "items") - # table.reference("author", "users") + # table.reference("item", "Items") + # table.reference("author", "Users") # table.text("content") # table.time("issued") # end Modified: groonga/trunk/ext/rb-grn-patricia-trie.c (+11 -11) =================================================================== --- groonga/trunk/ext/rb-grn-patricia-trie.c 2010-01-09 15:28:20 +09:00 (rev 918) +++ groonga/trunk/ext/rb-grn-patricia-trie.c 2010-01-09 15:35:41 +09:00 (rev 919) @@ -118,7 +118,7 @@ * * ???????????????????????????? * ???? - * Groonga::PatriciaTrie.create(:name => "", + * Groonga::PatriciaTrie.create(:name => "Bookmarks", * :persistent => true) * * ??????????512????????????????? @@ -130,27 +130,27 @@ * * ??????????????????????????? * ???????????????????????? - * Groonga::PatriciaTrie.create(:key_type => "") + * Groonga::PatriciaTrie.create(:key_type => "ShortText") * - * ?????????????????? + * ?????Bookmarks????????????? * ??????????????? - * bookmarks = Groonga::PatriciaTrie.create(:name => "") + * bookmarks = Groonga::PatriciaTrie.create(:name => "Bookmarks") * Groonga::PatriciaTrie.create(:key_type => bookmarks) * - * ?????????????????? + * ?????Bookmarks????????????? * ??????????????? * ?????????????? - * Groonga::PatriciaTrie.create(:name => "") - * Groonga::PatriciaTrie.create(:key_type => "") + * Groonga::PatriciaTrie.create(:name => "Bookmarks") + * Groonga::PatriciaTrie.create(:key_type => "Bookmarks") * * ???????????????????????????? * ??????? - * bookmarks = Groonga::PatriciaTrie.create(:name => "") - * bookmarks.define_column("comment", "") - * terms = Groonga::PatriciaTrie.create(:name => "", + * bookmarks = Groonga::PatriciaTrie.create(:name => "Bookmarks") + * bookmarks.define_column("comment", "Text") + * terms = Groonga::PatriciaTrie.create(:name => "Terms", * :default_tokenizer => "TokenBigram") * terms.define_index_column("content", bookmarks, - * :source => ".comment") + * :source => "Bookmarks.comment") */ static VALUE rb_grn_patricia_trie_s_create (int argc, VALUE *argv, VALUE self) Modified: groonga/trunk/ext/rb-grn-column.c (+3 -3) =================================================================== --- groonga/trunk/ext/rb-grn-column.c 2010-01-09 15:28:20 +09:00 (rev 918) +++ groonga/trunk/ext/rb-grn-column.c 2010-01-09 15:35:41 +09:00 (rev 919) @@ -135,9 +135,9 @@ * * ????????????????? * - * items = Groonga::Array.create(:name => "") - * title = items.define_column("title", "") - * title.name # => ".title" + * items = Groonga::Array.create(:name => "Items") + * title = items.define_column("title", "ShortText") + * title.name # => "Items.title" * title.local_name # => "title" */ static VALUE Modified: groonga/trunk/ext/rb-grn-hash.c (+11 -11) =================================================================== --- groonga/trunk/ext/rb-grn-hash.c 2010-01-09 15:28:20 +09:00 (rev 918) +++ groonga/trunk/ext/rb-grn-hash.c 2010-01-09 15:35:41 +09:00 (rev 919) @@ -108,7 +108,7 @@ * * ???????????????????????????? * ???? - * Groonga::Hash.create(:name => "", + * Groonga::Hash.create(:name => "Bookmarks", * :persistent => true) * * ??????????512????????????????? @@ -120,27 +120,27 @@ * * ??????????????????????????? * ???????????????????????? - * Groonga::Hash.create(:key_type => "") + * Groonga::Hash.create(:key_type => "ShortText") * - * ?????????????????? + * ?????Bookmarks????????????? * ??????????????? - * bookmarks = Groonga::Hash.create(:name => "") + * bookmarks = Groonga::Hash.create(:name => "Bookmarks") * Groonga::Hash.create(:key_type => bookmarks) * - * ?????????????????? + * ?????Bookmarks????????????? * ??????????????? * ?????????????? - * Groonga::Hash.create(:name => "") - * Groonga::Hash.create(:key_type => "") + * Groonga::Hash.create(:name => "Bookmarks") + * Groonga::Hash.create(:key_type => "Bookmarks") * * ???????????????????????????? * ??????? - * bookmarks = Groonga::Hash.create(:name => "") - * bookmarks.define_column("comment", "") - * terms = Groonga::Hash.create(:name => "", + * bookmarks = Groonga::Hash.create(:name => "Bookmarks") + * bookmarks.define_column("comment", "Text") + * terms = Groonga::Hash.create(:name => "Terms", * :default_tokenizer => "TokenBigram") * terms.define_index_column("content", bookmarks, - * :source => ".comment") + * :source => "Bookmarks.comment") */ static VALUE rb_grn_hash_s_create (int argc, VALUE *argv, VALUE self) Modified: groonga/trunk/ext/rb-grn-array.c (+3 -3) =================================================================== --- groonga/trunk/ext/rb-grn-array.c 2010-01-09 15:28:20 +09:00 (rev 918) +++ groonga/trunk/ext/rb-grn-array.c 2010-01-09 15:35:41 +09:00 (rev 919) @@ -163,9 +163,9 @@ * * ????????????????????Groonga::Array? * ????????????? - * users = Groonga::Array.create(:name => "") - * users.define_column("name", "") - * users.define_column("uri", "") + * users = Groonga::Array.create(:name => "Users") + * users.define_column("name", "ShortText") + * users.define_column("uri", "ShortText") * * ????????? * user = users.add From null at cozmixng.org Mon Jan 11 07:05:39 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Mon, 11 Jan 2010 21:05:39 +0900 Subject: [groonga-commit:874] groonga [groonga (trunk) r920] * add newly added exception. Message-ID: <20100111120539.3BD261D1CE9@mail.cozmixng.org> retro 2010-01-11 21:05:38 +0900 (Mon, 11 Jan 2010) New Revision: 920 Log: * add newly added exception. Modified files: groonga/trunk/ext/rb-grn-exception.c groonga/trunk/test/test-exception.rb Modified: groonga/trunk/test/test-exception.rb (+5 -0) =================================================================== --- groonga/trunk/test/test-exception.rb 2010-01-09 15:32:42 +09:00 (rev 919) +++ groonga/trunk/test/test-exception.rb 2010-01-11 21:05:38 +09:00 (rev 920) @@ -81,5 +81,10 @@ assert_const_defined(Groonga, :AddressIsInUse) assert_const_defined(Groonga, :ZLibError) assert_const_defined(Groonga, :LZOError) + assert_const_defined(Groonga, :StackOverFlow) + assert_const_defined(Groonga, :SyntaxError) + assert_const_defined(Groonga, :RetryMax) + assert_const_defined(Groonga, :IncompatibleFileFormat) + assert_const_defined(Groonga, :UpdateNotAllowed) end end Modified: groonga/trunk/ext/rb-grn-exception.c (+16 -1) =================================================================== --- groonga/trunk/ext/rb-grn-exception.c 2010-01-09 15:32:42 +09:00 (rev 919) +++ groonga/trunk/ext/rb-grn-exception.c 2010-01-11 21:05:38 +09:00 (rev 920) @@ -86,6 +86,7 @@ static VALUE eGrnSyntaxError; static VALUE eGrnRetryMax; static VALUE eGrnIncompatibleFileFormat; +static VALUE eGrnUpdateNotAllowed; VALUE rb_grn_rc_to_exception (grn_rc rc) @@ -294,6 +295,9 @@ case GRN_INCOMPATIBLE_FILE_FORMAT: exception = eGrnIncompatibleFileFormat; break; + case GRN_UPDATE_NOT_ALLOWED: + exception = eGrnUpdateNotAllowed; + break; } if (NIL_P(exception)) @@ -509,6 +513,9 @@ case GRN_INCOMPATIBLE_FILE_FORMAT: message = "incompatible file format"; break; + case GRN_UPDATE_NOT_ALLOWED: + message = "update isn't allowed"; + break; } if (!message) @@ -1064,7 +1071,7 @@ * ????????????????????? */ eGrnRetryMax = - rb_define_class_under(mGrn, "RertryError", rb_eGrnError); + rb_define_class_under(mGrn, "RetryMax", rb_eGrnError); /* * Document-class: Groonga::IncompatibleFileFormat @@ -1073,4 +1080,12 @@ */ eGrnIncompatibleFileFormat = rb_define_class_under(mGrn, "IncompatibleFileFormat", rb_eGrnError); + + /* + * Document-class: Groonga::UpdateNotAllowed + * + * ??????????????????????????????? + */ + eGrnUpdateNotAllowed = + rb_define_class_under(mGrn, "UpdateNotAllowed", rb_eGrnError); } From null at cozmixng.org Mon Jan 11 07:05:40 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Mon, 11 Jan 2010 21:05:40 +0900 Subject: [groonga-commit:875] groonga [groonga (trunk) r921] * convert Pathname to String explicitly. Message-ID: <20100111120540.9DC971D1CEA@mail.cozmixng.org> retro 2010-01-11 21:05:40 +0900 (Mon, 11 Jan 2010) New Revision: 921 Log: * convert Pathname to String explicitly. Modified files: groonga/trunk/test/test-schema.rb Modified: groonga/trunk/test/test-schema.rb (+2 -2) =================================================================== --- groonga/trunk/test/test-schema.rb 2010-01-11 20:53:14 +09:00 (rev 920) +++ groonga/trunk/test/test-schema.rb 2010-01-11 21:05:40 +09:00 (rev 921) @@ -142,7 +142,7 @@ Groonga::Schema.create_table("Posts") do |table| table.column("rate", type, - :path => path, + :path => path.to_s, :persistent => true, :type => :vector, :compress => :lzo) @@ -292,7 +292,7 @@ Groonga::Schema.create_table("Terms") do |table| table.index("Posts.content", :name => index_column_name, - :path => path, + :path => path.to_s, :persistent => true, :with_section => true, :with_weight => true, From null at cozmixng.org Thu Jan 21 02:30:41 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 21 Jan 2010 16:30:41 +0900 Subject: [groonga-commit:875] groonga [groonga (trunk) r922] changed the default value of :persistent to true for Table#define_column Message-ID: <20100121073041.C1BEC1D1C14@mail.cozmixng.org> retro 2010-01-21 16:30:41 +0900 (Thu, 21 Jan 2010) New Revision: 922 Log: changed the default value of :persistent to true for Table#define_column and Table#define_index_column Modified files: groonga/trunk/ext/rb-grn-table.c groonga/trunk/test/test-table.rb Modified: groonga/trunk/ext/rb-grn-table.c (+10 -6) =================================================================== --- groonga/trunk/ext/rb-grn-table.c 2010-01-11 20:55:34 +09:00 (rev 921) +++ groonga/trunk/ext/rb-grn-table.c 2010-01-21 16:30:41 +09:00 (rev 922) @@ -404,8 +404,10 @@ * ??????????? * * [+:persistent+] - * +true+???????????????+:path+????? - * ???????????????? + * +true+??????????????????????? + * ????????+:path+??????????????? + * ?????????+:path+??????+:persistent+? + * ?????????????????? * * [+:type+] * ??????????????????????????? @@ -461,7 +463,7 @@ flags |= GRN_OBJ_PERSISTENT; } - if (RVAL2CBOOL(rb_persistent)) + if (NIL_P(rb_persistent) || RVAL2CBOOL(rb_persistent)) flags |= GRN_OBJ_PERSISTENT; if (NIL_P(rb_type) || @@ -508,8 +510,10 @@ * ??????????? * * [+:persistent+] - * +true+???????????????+:path+????? - * ???????????????? + * +true+??????????????????????? + * ????????+:path+??????????????? + * ?????????+:path+??????+:persistent+? + * ?????????????????? * * [+:with_section+] * ?????section(????)?????????? @@ -566,7 +570,7 @@ flags |= GRN_OBJ_PERSISTENT; } - if (RVAL2CBOOL(rb_persistent)) + if (NIL_P(rb_persistent) || RVAL2CBOOL(rb_persistent)) flags |= GRN_OBJ_PERSISTENT; if (RVAL2CBOOL(rb_with_section)) Modified: groonga/trunk/test/test-table.rb (+53 -0) =================================================================== --- groonga/trunk/test/test-table.rb 2010-01-11 20:55:34 +09:00 (rev 921) +++ groonga/trunk/test/test-table.rb 2010-01-21 16:30:41 +09:00 (rev 922) @@ -117,6 +117,59 @@ assert_equal(column, table.column("name")) end + def test_define_column_default_persistent + path_is_temporary = "name: , path: \(temporary\)" + + bookmarks = Groonga::Hash.create(:name => "Bookmarks") + real_name = bookmarks.define_column("real_name", "ShortText") + assert_equal(nil, real_name.inspect.index(path_is_temporary)) + end + + def test_define_column_not_persistent + path_is_temporary = "name: , path: \(temporary\)" + + bookmarks = Groonga::Hash.create(:name => "Bookmarks") + real_name = bookmarks.define_column("real_name", "ShortText", :persistent => false) + assert_not_equal(nil, real_name.inspect.index(path_is_temporary)) + end + + def test_define_column_ignore_persistent + column_path = @tables_dir + "bookmakrs.real_name.column" + path_is_temporary = "name: , path: \(temporary\)" + + bookmarks = Groonga::Hash.create(:name => "Bookmarks") + real_name = bookmarks.define_column("real_name", "ShortText", :path => column_path, :persistent => false) + assert_equal(nil, real_name.inspect.index(path_is_temporary)) + end + + def test_define_index_column_default_persistent + path_is_temporary = "name: , path: \(temporary\)" + + bookmarks = Groonga::Hash.create(:name => "Bookmarks") + terms = Groonga::Hash.create(:name => "Terms") + real_name = terms.define_index_column("real_name", bookmarks) + assert_equal(nil, real_name.inspect.index(path_is_temporary)) + end + + def test_define_index_column_not_persistent + path_is_temporary = "name: , path: \(temporary\)" + + bookmarks = Groonga::Hash.create(:name => "Bookmarks") + terms = Groonga::Hash.create(:name => "Terms") + real_name = terms.define_index_column("real_name", bookmarks, :persistent => false) + assert_not_equal(nil, real_name.inspect.index(path_is_temporary)) + end + + def test_define_index_column_ignore_persistent + column_path = @tables_dir + "bookmakrs.real_name.column" + path_is_temporary = "name: , path: \(temporary\)" + + bookmarks = Groonga::Hash.create(:name => "Bookmarks") + terms = Groonga::Hash.create(:name => "Terms") + real_name = terms.define_index_column("real_name", bookmarks, :path => column_path, :persistent => false) + assert_equal(nil, real_name.inspect.index(path_is_temporary)) + end + def test_define_index_column bookmarks = Groonga::Hash.create(:name => "Bookmarks") bookmarks.define_column("content", "Text") From null at cozmixng.org Thu Jan 21 03:45:52 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 21 Jan 2010 17:45:52 +0900 Subject: [groonga-commit:876] groonga [groonga (trunk) r923] raise exceptions when path is passed and persistent is passed as false Message-ID: <20100121084552.4F8E41D1C0D@mail.cozmixng.org> retro 2010-01-21 17:45:51 +0900 (Thu, 21 Jan 2010) New Revision: 923 Log: raise exceptions when path is passed and persistent is passed as false Modified files: groonga/trunk/ext/rb-grn-table.c groonga/trunk/test/test-table.rb Modified: groonga/trunk/ext/rb-grn-table.c (+6 -0) =================================================================== --- groonga/trunk/ext/rb-grn-table.c 2010-01-21 16:24:47 +09:00 (rev 922) +++ groonga/trunk/ext/rb-grn-table.c 2010-01-21 17:45:51 +09:00 (rev 923) @@ -461,6 +461,9 @@ if (!NIL_P(rb_path)) { path = StringValueCStr(rb_path); flags |= GRN_OBJ_PERSISTENT; + if (!NIL_P(rb_persistent) && !RVAL2CBOOL(rb_persistent)) + rb_raise(rb_eArgError, + "should not pass path if persistent is false"); } if (NIL_P(rb_persistent) || RVAL2CBOOL(rb_persistent)) @@ -568,6 +571,9 @@ if (!NIL_P(rb_path)) { path = StringValueCStr(rb_path); flags |= GRN_OBJ_PERSISTENT; + if (!NIL_P(rb_persistent) && !RVAL2CBOOL(rb_persistent)) + rb_raise(rb_eArgError, + "should not pass path if persistent is false"); } if (NIL_P(rb_persistent) || RVAL2CBOOL(rb_persistent)) Modified: groonga/trunk/test/test-table.rb (+16 -8) =================================================================== --- groonga/trunk/test/test-table.rb 2010-01-21 16:24:47 +09:00 (rev 922) +++ groonga/trunk/test/test-table.rb 2010-01-21 17:45:51 +09:00 (rev 923) @@ -129,17 +129,21 @@ path_is_temporary = "name: , path: \(temporary\)" bookmarks = Groonga::Hash.create(:name => "Bookmarks") - real_name = bookmarks.define_column("real_name", "ShortText", :persistent => false) + real_name = bookmarks.define_column("real_name", "ShortText", + :persistent => false) assert_not_equal(nil, real_name.inspect.index(path_is_temporary)) end - def test_define_column_ignore_persistent + def test_define_column_not_persistent_and_path column_path = @tables_dir + "bookmakrs.real_name.column" path_is_temporary = "name: , path: \(temporary\)" bookmarks = Groonga::Hash.create(:name => "Bookmarks") - real_name = bookmarks.define_column("real_name", "ShortText", :path => column_path, :persistent => false) - assert_equal(nil, real_name.inspect.index(path_is_temporary)) + assert_raise(ArgumentError.new("should not pass path if persistent is false")) do + real_name = bookmarks.define_column("real_name", "ShortText", + :path => column_path, + :persistent => false) + end end def test_define_index_column_default_persistent @@ -156,18 +160,22 @@ bookmarks = Groonga::Hash.create(:name => "Bookmarks") terms = Groonga::Hash.create(:name => "Terms") - real_name = terms.define_index_column("real_name", bookmarks, :persistent => false) + real_name = terms.define_index_column("real_name", bookmarks, + :persistent => false) assert_not_equal(nil, real_name.inspect.index(path_is_temporary)) end - def test_define_index_column_ignore_persistent + def test_define_index_column_not_persistent_and_path column_path = @tables_dir + "bookmakrs.real_name.column" path_is_temporary = "name: , path: \(temporary\)" bookmarks = Groonga::Hash.create(:name => "Bookmarks") terms = Groonga::Hash.create(:name => "Terms") - real_name = terms.define_index_column("real_name", bookmarks, :path => column_path, :persistent => false) - assert_equal(nil, real_name.inspect.index(path_is_temporary)) + assert_raise(ArgumentError.new("should not pass path if persistent is false")) do + real_name = terms.define_index_column("real_name", bookmarks, + :path => column_path, + :persistent => false) + end end def test_define_index_column From null at cozmixng.org Thu Jan 21 03:45:54 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 21 Jan 2010 17:45:54 +0900 Subject: [groonga-commit:877] groonga [groonga (trunk) r924] forgot to update corresponding documents Message-ID: <20100121084554.989CF1D1C15@mail.cozmixng.org> retro 2010-01-21 17:45:53 +0900 (Thu, 21 Jan 2010) New Revision: 924 Log: forgot to update corresponding documents Modified files: groonga/trunk/ext/rb-grn-table.c Modified: groonga/trunk/ext/rb-grn-table.c (+2 -4) =================================================================== --- groonga/trunk/ext/rb-grn-table.c 2010-01-21 17:30:56 +09:00 (rev 923) +++ groonga/trunk/ext/rb-grn-table.c 2010-01-21 17:45:53 +09:00 (rev 924) @@ -406,8 +406,7 @@ * [+:persistent+] * +true+??????????????????????? * ????????+:path+??????????????? - * ?????????+:path+??????+:persistent+? - * ?????????????????? + * ?????? * * [+:type+] * ??????????????????????????? @@ -515,8 +514,7 @@ * [+:persistent+] * +true+??????????????????????? * ????????+:path+??????????????? - * ?????????+:path+??????+:persistent+? - * ?????????????????? + * ?????? * * [+:with_section+] * ?????section(????)?????????? From null at cozmixng.org Thu Jan 21 04:15:25 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 21 Jan 2010 18:15:25 +0900 Subject: [groonga-commit:878] groonga [groonga (trunk) r925] * clean-up: remove duplicated conditions. Message-ID: <20100121091525.CEDAE1D1C0B@mail.cozmixng.org> retro 2010-01-21 18:15:25 +0900 (Thu, 21 Jan 2010) New Revision: 925 Log: * clean-up: remove duplicated conditions. Modified files: groonga/trunk/ext/rb-grn-table.c Modified: groonga/trunk/ext/rb-grn-table.c (+16 -12) =================================================================== --- groonga/trunk/ext/rb-grn-table.c 2010-01-21 17:33:39 +09:00 (rev 924) +++ groonga/trunk/ext/rb-grn-table.c 2010-01-21 18:15:25 +09:00 (rev 925) @@ -457,17 +457,19 @@ value_type = RVAL2GRNOBJECT(rb_value_type, &context); + if (NIL_P(rb_persistent) || RVAL2CBOOL(rb_persistent)) + flags |= GRN_OBJ_PERSISTENT; + if (!NIL_P(rb_path)) { path = StringValueCStr(rb_path); + if ((flags & GRN_OBJ_PERSISTENT) == GRN_OBJ_PERSISTENT) { + rb_raise(rb_eArgError, + "should not pass path if persistent is false: <%s>", + path); + } flags |= GRN_OBJ_PERSISTENT; - if (!NIL_P(rb_persistent) && !RVAL2CBOOL(rb_persistent)) - rb_raise(rb_eArgError, - "should not pass path if persistent is false"); } - if (NIL_P(rb_persistent) || RVAL2CBOOL(rb_persistent)) - flags |= GRN_OBJ_PERSISTENT; - if (NIL_P(rb_type) || (rb_grn_equal_option(rb_type, "scalar"))) { flags |= GRN_OBJ_COLUMN_SCALAR; @@ -566,17 +568,19 @@ value_type = RVAL2GRNOBJECT(rb_value_type, &context); + if (NIL_P(rb_persistent) || RVAL2CBOOL(rb_persistent)) + flags |= GRN_OBJ_PERSISTENT; + if (!NIL_P(rb_path)) { path = StringValueCStr(rb_path); + if ((flags & GRN_OBJ_PERSISTENT) == GRN_OBJ_PERSISTENT) { + rb_raise(rb_eArgError, + "should not pass path if persistent is false: <%s>", + path); + } flags |= GRN_OBJ_PERSISTENT; - if (!NIL_P(rb_persistent) && !RVAL2CBOOL(rb_persistent)) - rb_raise(rb_eArgError, - "should not pass path if persistent is false"); } - if (NIL_P(rb_persistent) || RVAL2CBOOL(rb_persistent)) - flags |= GRN_OBJ_PERSISTENT; - if (RVAL2CBOOL(rb_with_section)) flags |= GRN_OBJ_WITH_SECTION; From null at cozmixng.org Thu Jan 21 04:15:27 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 21 Jan 2010 18:15:27 +0900 Subject: [groonga-commit:879] groonga [groonga (trunk) r926] * improve document. Message-ID: <20100121091527.3682B1D1C0D@mail.cozmixng.org> retro 2010-01-21 18:15:26 +0900 (Thu, 21 Jan 2010) New Revision: 926 Log: * improve document. Modified files: groonga/trunk/ext/rb-grn-table.c Modified: groonga/trunk/ext/rb-grn-table.c (+2 -3) =================================================================== --- groonga/trunk/ext/rb-grn-table.c 2010-01-21 18:05:55 +09:00 (rev 925) +++ groonga/trunk/ext/rb-grn-table.c 2010-01-21 18:15:26 +09:00 (rev 926) @@ -1166,12 +1166,11 @@ /* * call-seq: - * table.group(keys) -> Groonga::Table??? - * Groonga::Table??? + * table.group(key) -> Groonga::Table + * table.group(keys) -> [Groonga::Table, ...] * * _table_??????_keys_???????????????? * ?????????????? - * */ static VALUE rb_grn_table_group (int argc, VALUE *argv, VALUE self) From null at cozmixng.org Thu Jan 21 04:15:28 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 21 Jan 2010 18:15:28 +0900 Subject: [groonga-commit:880] groonga [groonga (trunk) r927] * improve error message. Message-ID: <20100121091528.8C2771D1C14@mail.cozmixng.org> retro 2010-01-21 18:15:28 +0900 (Thu, 21 Jan 2010) New Revision: 927 Log: * improve error message. Modified files: groonga/trunk/ext/rb-grn-table.c groonga/trunk/test/test-table.rb Modified: groonga/trunk/ext/rb-grn-table.c (+4 -4) =================================================================== --- groonga/trunk/ext/rb-grn-table.c 2010-01-21 18:06:41 +09:00 (rev 926) +++ groonga/trunk/ext/rb-grn-table.c 2010-01-21 18:15:28 +09:00 (rev 927) @@ -462,9 +462,9 @@ if (!NIL_P(rb_path)) { path = StringValueCStr(rb_path); - if ((flags & GRN_OBJ_PERSISTENT) == GRN_OBJ_PERSISTENT) { + if ((flags & GRN_OBJ_PERSISTENT) != GRN_OBJ_PERSISTENT) { rb_raise(rb_eArgError, - "should not pass path if persistent is false: <%s>", + "should not pass :path if :persistent is false: <%s>", path); } flags |= GRN_OBJ_PERSISTENT; @@ -573,9 +573,9 @@ if (!NIL_P(rb_path)) { path = StringValueCStr(rb_path); - if ((flags & GRN_OBJ_PERSISTENT) == GRN_OBJ_PERSISTENT) { + if ((flags & GRN_OBJ_PERSISTENT) != GRN_OBJ_PERSISTENT) { rb_raise(rb_eArgError, - "should not pass path if persistent is false: <%s>", + "should not pass :path if :persistent is false: <%s>", path); } flags |= GRN_OBJ_PERSISTENT; Modified: groonga/trunk/test/test-table.rb (+4 -2) =================================================================== --- groonga/trunk/test/test-table.rb 2010-01-21 18:06:41 +09:00 (rev 926) +++ groonga/trunk/test/test-table.rb 2010-01-21 18:15:28 +09:00 (rev 927) @@ -139,7 +139,8 @@ path_is_temporary = "name: , path: \(temporary\)" bookmarks = Groonga::Hash.create(:name => "Bookmarks") - assert_raise(ArgumentError.new("should not pass path if persistent is false")) do + message = "should not pass :path if :persistent is false: <#{column_path}>" + assert_raise(ArgumentError.new(message)) do real_name = bookmarks.define_column("real_name", "ShortText", :path => column_path, :persistent => false) @@ -171,7 +172,8 @@ bookmarks = Groonga::Hash.create(:name => "Bookmarks") terms = Groonga::Hash.create(:name => "Terms") - assert_raise(ArgumentError.new("should not pass path if persistent is false")) do + message = "should not pass :path if :persistent is false: <#{column_path}>" + assert_raise(ArgumentError.new(message)) do real_name = terms.define_index_column("real_name", bookmarks, :path => column_path, :persistent => false) From null at cozmixng.org Thu Jan 21 04:30:33 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 21 Jan 2010 18:30:33 +0900 Subject: [groonga-commit:880] groonga [groonga (trunk) r928] add Object#path Message-ID: <20100121093033.906C21D1C0B@mail.cozmixng.org> retro 2010-01-21 18:30:32 +0900 (Thu, 21 Jan 2010) New Revision: 928 Log: add Object#path Modified files: groonga/trunk/ext/rb-grn-object.c groonga/trunk/test/test-table.rb Modified: groonga/trunk/ext/rb-grn-object.c (+28 -0) =================================================================== --- groonga/trunk/ext/rb-grn-object.c 2010-01-21 18:10:14 +09:00 (rev 927) +++ groonga/trunk/ext/rb-grn-object.c 2010-01-21 18:30:32 +09:00 (rev 928) @@ -792,6 +792,33 @@ } /* + * Document-method: path + * + * call-seq: + * object.path -> ??????/nil + * + * _object_?????????????????_object_ + * ??+nil+???? + */ +static VALUE +rb_grn_object_get_path (VALUE self) +{ + RbGrnObject *rb_grn_object; + const char *path; + + rb_grn_object = SELF(self); + if (!rb_grn_object->object) + return Qnil; + + path = grn_obj_path(rb_grn_object->context, rb_grn_object->object); + + if (!path) + return Qnil; + else + return rb_str_new2(path); +} + +/* * Document-method: domain * * call-seq: @@ -1121,6 +1148,7 @@ rb_define_method(rb_cGrnObject, "domain", rb_grn_object_get_domain, 0); rb_define_method(rb_cGrnObject, "name", rb_grn_object_get_name, 0); rb_define_method(rb_cGrnObject, "range", rb_grn_object_get_range, 0); + rb_define_method(rb_cGrnObject, "path", rb_grn_object_get_path, 0); rb_define_method(rb_cGrnObject, "==", rb_grn_object_equal, 1); Modified: groonga/trunk/test/test-table.rb (+7 -0) =================================================================== --- groonga/trunk/test/test-table.rb 2010-01-21 18:10:14 +09:00 (rev 927) +++ groonga/trunk/test/test-table.rb 2010-01-21 18:30:32 +09:00 (rev 928) @@ -319,6 +319,13 @@ assert_equal(3, bookmarks.size) end + def test_path + bookmarks_path = @tables_dir + "bookmarks" + bookmarks = Groonga::Array.create(:name => "Bookmarks", + :path => bookmarks_path.to_s) + assert_equal(bookmarks_path.to_s, bookmarks.path) + end + def test_time_column bookmarks_path = @tables_dir + "bookmarks" bookmarks = Groonga::Array.create(:name => "Bookmarks", From null at cozmixng.org Sat Jan 23 21:45:33 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sun, 24 Jan 2010 11:45:33 +0900 Subject: [groonga-commit:881] groonga [groonga (trunk) r929] * specify encoding explicitly. Message-ID: <20100124024533.7A4111D1C18@mail.cozmixng.org> retro 2010-01-24 11:45:33 +0900 (Sun, 24 Jan 2010) New Revision: 929 Log: * specify encoding explicitly. Modified files: groonga/trunk/example/search/config.ru Modified: groonga/trunk/example/search/config.ru (+3 -2) =================================================================== --- groonga/trunk/example/search/config.ru 2010-01-21 18:24:28 +09:00 (rev 928) +++ groonga/trunk/example/search/config.ru 2010-01-24 11:45:33 +09:00 (rev 929) @@ -23,14 +23,15 @@ def call(env) request = Rack::Request.new(env) response = Rack::Response.new - response["Content-Type"] = "text/html" + response["Content-Type"] = "text/html; charset=UTF-8" response.write(<<-EOH) + - + groonga????? From null at cozmixng.org Sat Jan 23 21:45:34 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sun, 24 Jan 2010 11:45:34 +0900 Subject: [groonga-commit:882] groonga [groonga (trunk) r930] * ensure path ends with "/". Message-ID: <20100124024535.0327B1D1C19@mail.cozmixng.org> retro 2010-01-24 11:45:34 +0900 (Sun, 24 Jan 2010) New Revision: 930 Log: * ensure path ends with "/". Modified files: groonga/trunk/example/search/config.ru Modified: groonga/trunk/example/search/config.ru (+5 -0) =================================================================== --- groonga/trunk/example/search/config.ru 2010-01-24 11:35:56 +09:00 (rev 929) +++ groonga/trunk/example/search/config.ru 2010-01-24 11:45:34 +09:00 (rev 930) @@ -24,6 +24,11 @@ request = Rack::Request.new(env) response = Rack::Response.new response["Content-Type"] = "text/html; charset=UTF-8" + if /\/\z/ !~ request.path_info + request.path_info += "/" + response.redirect(request.url) + return response.to_a + end response.write(<<-EOH) From null at cozmixng.org Sun Jan 24 04:15:34 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sun, 24 Jan 2010 18:15:34 +0900 Subject: [groonga-commit:883] groonga [groonga (trunk) r931] * ext/rb-grn-object.c: add inspected invalid object to error Message-ID: <20100124091534.9A0EA1D1C0D@mail.cozmixng.org> retro 2010-01-24 18:15:34 +0900 (Sun, 24 Jan 2010) New Revision: 931 Log: * ext/rb-grn-object.c: add inspected invalid object to error message. Modified files: groonga/trunk/ext/rb-grn-object.c Modified: groonga/trunk/ext/rb-grn-object.c (+2 -1) =================================================================== --- groonga/trunk/ext/rb-grn-object.c 2010-01-24 11:36:35 +09:00 (rev 930) +++ groonga/trunk/ext/rb-grn-object.c 2010-01-24 18:15:34 +09:00 (rev 931) @@ -65,7 +65,8 @@ } if (!RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGrnObject))) { - rb_raise(rb_eTypeError, "not a groonga object"); + rb_raise(rb_eTypeError, "not a groonga object: <%s>", + rb_grn_inspect(object)); } Data_Get_Struct(object, RbGrnObject, rb_grn_object); From null at cozmixng.org Sun Jan 24 05:15:30 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Sun, 24 Jan 2010 19:15:30 +0900 Subject: [groonga-commit:884] groonga [groonga (trunk) r932] * fix no method error. Message-ID: <20100124101530.5D9A31D1C0D@mail.cozmixng.org> retro 2010-01-24 19:15:29 +0900 (Sun, 24 Jan 2010) New Revision: 932 Log: * fix no method error. Modified files: groonga/trunk/lib/groonga/schema.rb Modified: groonga/trunk/lib/groonga/schema.rb (+13 -11) =================================================================== --- groonga/trunk/lib/groonga/schema.rb 2010-01-24 18:00:46 +09:00 (rev 931) +++ groonga/trunk/lib/groonga/schema.rb 2010-01-24 19:15:29 +09:00 (rev 932) @@ -431,7 +431,7 @@ table ||= @table_type.create(create_options) end @definitions.each do |definition| - definition.define(table) + definition.define(self, table) end table end @@ -748,10 +748,10 @@ @type = nil end - def define(table) + def define(table_definition, table) column = table.column(@name) if column - return column if same_column?(column) + return column if same_column?(table_definition, column) if @options.delete(:force) column.remove else @@ -767,8 +767,8 @@ end private - def same_column?(column) - context = column.table.context + def same_column?(table_definition, column) + context = table_definition.context # TODO: should check column type and other options. column.range == context[Schema.normalize_type(@type)] end @@ -784,7 +784,7 @@ @options = (options || {}).dup end - def define(table) + def define(table_definition, table) table.column(@name).remove end end @@ -800,15 +800,17 @@ @target = nil end - def define(table) + def define(table_definition, table) target = @target - target = table.context[target] unless target.is_a?(Groonga::Object) + unless target.is_a?(Groonga::Object) + target = table_definition.context[target] + end if target.nil? raise ArgumentError, "Unknown index target: #{@target.inspect}" end index = table.column(@name) if index - return index if same_index?(index, target) + return index if same_index?(table_definition, index, target) if @options.delete(:force) index.remove else @@ -827,8 +829,8 @@ end private - def same_index?(index, target) - context = index.table.context + def same_index?(table_definition, index, target) + context = table_definition.context # TODO: should check column type and other options. index.range == target.table and index.sources == [target] end From null at cozmixng.org Tue Jan 26 19:30:37 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Wed, 27 Jan 2010 09:30:37 +0900 Subject: [groonga-commit:885] groonga [groonga (trunk) r933] * don't accept nil for =~ argument. Message-ID: <20100127003037.CB6721D1C1C@mail.cozmixng.org> retro 2010-01-27 09:30:37 +0900 (Wed, 27 Jan 2010) New Revision: 933 Log: * don't accept nil for =~ argument. Modified files: groonga/trunk/lib/groonga/expression-builder.rb groonga/trunk/test/test-expression-builder.rb Modified: groonga/trunk/test/test-expression-builder.rb (+10 -0) =================================================================== --- groonga/trunk/test/test-expression-builder.rb 2010-01-24 19:03:22 +09:00 (rev 932) +++ groonga/trunk/test/test-expression-builder.rb 2010-01-27 09:30:37 +09:00 (rev 933) @@ -143,4 +143,14 @@ assert_equal(["http://groonga.org/", "http://ruby-lang.org/"], result.collect {|record| record.key["uri"]}) end + + def test_nil_match + @users.select do |record| + exception = ArgumentError.new("match word should not be nil: Users.name") + assert_raise(exception) do + record["name"] =~ nil + end + record["name"] == "dummy" + end + end end Modified: groonga/trunk/lib/groonga/expression-builder.rb (+4 -0) =================================================================== --- groonga/trunk/lib/groonga/expression-builder.rb 2010-01-24 19:03:22 +09:00 (rev 932) +++ groonga/trunk/lib/groonga/expression-builder.rb 2010-01-27 09:30:37 +09:00 (rev 933) @@ -235,6 +235,10 @@ end def =~(other) + if other.nil? + full_column_name = "#{@table.name}.#{@column_name}" + raise ArgumentError, "match word should not be nil: #{full_column_name}" + end MatchExpressionBuilder.new(@default_column, normalize(other)) end From null at cozmixng.org Wed Jan 27 01:15:32 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Wed, 27 Jan 2010 15:15:32 +0900 Subject: [groonga-commit:886] groonga [groonga (trunk) r934] * support table reference uvector as column value. Message-ID: <20100127061532.CD3EC1D1C1B@mail.cozmixng.org> retro 2010-01-27 15:15:32 +0900 (Wed, 27 Jan 2010) New Revision: 934 Log: * support table reference uvector as column value. Added files: groonga/trunk/test/test-vector-column.rb Modified files: groonga/trunk/ext/rb-grn-object.c groonga/trunk/ext/rb-grn-utils.c Modified: groonga/trunk/ext/rb-grn-object.c (+17 -3) =================================================================== --- groonga/trunk/ext/rb-grn-object.c 2010-01-27 09:15:58 +09:00 (rev 933) +++ groonga/trunk/ext/rb-grn-object.c 2010-01-27 15:15:32 +09:00 (rev 934) @@ -1002,7 +1002,6 @@ case GRN_OBJ_COLUMN_VECTOR: GRN_OBJ_INIT(&value, GRN_VECTOR, 0, range_id); break; - case GRN_OBJ_COLUMN_INDEX: case GRN_OBJ_COLUMN_SCALAR: GRN_OBJ_INIT(&value, GRN_BULK, 0, range_id); break; @@ -1012,6 +1011,9 @@ break; } break; + case GRN_COLUMN_INDEX: + GRN_UINT32_INIT(&value, 0); + break; default: rb_raise(rb_eGrnError, "unsupported type: %s", rb_grn_inspect(self)); @@ -1046,8 +1048,20 @@ context = rb_grn_object->context; id = NUM2UINT(rb_id); if (RVAL2CBOOL(rb_obj_is_kind_of(rb_value, rb_cArray))) { - GRN_OBJ_INIT(&value, GRN_VECTOR, 0, GRN_ID_NIL); - RVAL2GRNVECTOR(rb_value, context, &value); + switch (rb_grn_object->range->header.type) { + case GRN_TABLE_HASH_KEY: + case GRN_TABLE_PAT_KEY: + case GRN_TABLE_NO_KEY: + case GRN_TABLE_VIEW: + GRN_OBJ_INIT(&value, GRN_UVECTOR, 0, + rb_grn_object->object->header.domain); + RVAL2GRNUVECTOR(rb_value, context, &value); + break; + default: + GRN_OBJ_INIT(&value, GRN_VECTOR, 0, GRN_ID_NIL); + RVAL2GRNVECTOR(rb_value, context, &value); + break; + } } else { GRN_OBJ_INIT(&value, GRN_BULK, 0, GRN_ID_NIL); RVAL2GRNBULK(rb_value, context, &value); Modified: groonga/trunk/ext/rb-grn-utils.c (+20 -9) =================================================================== --- groonga/trunk/ext/rb-grn-utils.c 2010-01-27 09:15:58 +09:00 (rev 933) +++ groonga/trunk/ext/rb-grn-utils.c 2010-01-27 15:15:32 +09:00 (rev 934) @@ -1,7 +1,7 @@ /* -*- c-file-style: "ruby" -*- */ /* vim: set sts=4 sw=4 ts=8 noet: */ /* - Copyright (C) 2009 Kouhei Sutou + Copyright (C) 2009-2010 Kouhei Sutou This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -496,13 +496,8 @@ VALUE *values; int i, n; - if (uvector) - GRN_OBJ_INIT(uvector, GRN_UVECTOR, 0, GRN_ID_NIL); - else - uvector = grn_obj_open(context, GRN_UVECTOR, 0, 0); - if (NIL_P(object)) - return uvector; + return NULL; n = RARRAY_LEN(object); values = RARRAY_PTR(object); @@ -512,9 +507,25 @@ void *grn_value; value = values[i]; - id = NUM2UINT(value); + switch (TYPE(value)) { + case T_FIXNUM: + id = NUM2UINT(value); + break; + default: + if (RVAL2CBOOL(rb_obj_is_kind_of(value, rb_cGrnRecord))) { + id = NUM2UINT(rb_funcall(value, rb_intern("id"), 0)); + } else { + grn_obj_close(context, uvector); + rb_raise(rb_eArgError, + "uvector value should be one of " + "[Fixnum, Groonga::Record]: %s (%s)", + rb_grn_inspect(value), + rb_grn_inspect(object)); + } + break; + } grn_value = &id; - grn_bulk_write(context, uvector, grn_value, sizeof(id)); + grn_bulk_write(context, uvector, grn_value, sizeof(grn_id)); } return uvector; Added: groonga/trunk/test/test-vector-column.rb (+50 -0) =================================================================== --- groonga/trunk/test/test-vector-column.rb 2010-01-27 09:15:58 +09:00 (rev 933) +++ groonga/trunk/test/test-vector-column.rb 2010-01-27 15:15:32 +09:00 (rev 934) @@ -0,0 +1,50 @@ +# Copyright (C) 2010 Kouhei Sutou +# +# 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 VectorColumnTest < Test::Unit::TestCase + include GroongaTestUtils + + def setup + setup_database + setup_tables + end + + def setup_tables + Groonga::Schema.define do |schema| + schema.create_table("Users", + :type => :hash, + :key_type => "UInt32") do |table| + end + + schema.create_table("Communities", + :type => :hash, + :key_type => "ShortText") do |table| + table.reference("users", "Users", :type => :vector) + end + end + + @users = Groonga::Context.default["Users"] + @communities = Groonga::Context.default["Communities"] + end + + def test_set_and_get + groonga = @communities.add("groonga") + morita = @users.add(29) + groonga["users"] = [morita] + + assert_equal([29], @users.collect {|record| record.key}) + assert_equal([29], groonga["users"].collect {|record| record.key}) + end +end From null at cozmixng.org Wed Jan 27 01:30:41 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Wed, 27 Jan 2010 15:30:41 +0900 Subject: [groonga-commit:887] groonga [groonga (trunk) r935] * add NULL check in mark function. It may be passed NULL? Message-ID: <20100127063041.604691D1C1B@mail.cozmixng.org> retro 2010-01-27 15:30:40 +0900 (Wed, 27 Jan 2010) New Revision: 935 Log: * add NULL check in mark function. It may be passed NULL? Modified files: groonga/trunk/ext/rb-grn-table.c Modified: groonga/trunk/ext/rb-grn-table.c (+3 -0) =================================================================== --- groonga/trunk/ext/rb-grn-table.c 2010-01-27 15:07:01 +09:00 (rev 934) +++ groonga/trunk/ext/rb-grn-table.c 2010-01-27 15:30:40 +09:00 (rev 935) @@ -98,6 +98,9 @@ int n; grn_table_cursor *cursor; + if (!rb_grn_object) + return; + context = rb_grn_object->context; table = rb_grn_object->object; if (!context || !table) From null at cozmixng.org Wed Jan 27 01:45:28 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Wed, 27 Jan 2010 15:45:28 +0900 Subject: [groonga-commit:888] groonga [groonga (trunk) r936] * set @context after all variables are initialized. Message-ID: <20100127064528.931461D1C1B@mail.cozmixng.org> retro 2010-01-27 15:45:27 +0900 (Wed, 27 Jan 2010) New Revision: 936 Log: * set @context after all variables are initialized. Modified files: groonga/trunk/ext/rb-grn-object.c Modified: groonga/trunk/ext/rb-grn-object.c (+6 -6) =================================================================== --- groonga/trunk/ext/rb-grn-object.c 2010-01-27 15:21:09 +09:00 (rev 935) +++ groonga/trunk/ext/rb-grn-object.c 2010-01-27 15:45:27 +09:00 (rev 936) @@ -261,11 +261,11 @@ RbGrnObject *rb_grn_object, grn_ctx *context, grn_obj *object) { - DATA_PTR(self) = rb_grn_object; - rb_iv_set(self, "@context", rb_context); - + rb_grn_object->context = context; + rb_grn_object->object = object; rb_grn_object->self = self; rb_grn_object->need_close = RB_GRN_TRUE; + switch (object->header.type) { case GRN_DB: case GRN_CURSOR_TABLE_HASH_KEY: @@ -291,9 +291,6 @@ break; } - rb_grn_object->context = context; - rb_grn_object->object = object; - rb_grn_object->domain_id = GRN_ID_NIL; if (object) rb_grn_object->domain_id = object->header.domain; @@ -309,6 +306,9 @@ rb_grn_object->range = NULL; else rb_grn_object->range = grn_ctx_at(context, rb_grn_object->range_id); + + DATA_PTR(self) = rb_grn_object; + rb_iv_set(self, "@context", rb_context); } void From null at cozmixng.org Wed Jan 27 01:45:29 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Wed, 27 Jan 2010 15:45:29 +0900 Subject: [groonga-commit:889] groonga [groonga (trunk) r937] * also collect text in . Message-ID: <20100127064530.0C86C1D1C1C@mail.cozmixng.org> retro 2010-01-27 15:45:29 +0900 (Wed, 27 Jan 2010) New Revision: 937 Log: * also collect text in . Modified files: groonga/trunk/example/index-html.rb Modified: groonga/trunk/example/index-html.rb (+11 -1) =================================================================== --- groonga/trunk/example/index-html.rb 2010-01-27 15:32:23 +09:00 (rev 936) +++ groonga/trunk/example/index-html.rb 2010-01-27 15:45:29 +09:00 (rev 937) @@ -65,9 +65,19 @@ html_document.css("title").each do |title| values[:title] = title.text end + contents = [] html_document.css("body").each do |body| - values[:content] = body.text + contents << body.text end + html_document.css("img").each do |image| + image_content = [] + title = image['title'] + alt = image['alt'] + image_content << title if title and !title.empty? + image_content << alt if alt and !alt.empty? + contents.concat(image_content) unless image_content.empty? + end + values[:content] = contents.join("\n") values["last-modified"] = path.mtime values.each do |key, value| From null at cozmixng.org Wed Jan 27 08:00:36 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Wed, 27 Jan 2010 22:00:36 +0900 Subject: [groonga-commit:890] groonga [groonga (trunk) r938] Implemented Groonga::Column#lock/unlock/clear_lock/locked?. Message-ID: <20100127130036.5A0B41D1C1B@mail.cozmixng.org> retro 2010-01-27 22:00:35 +0900 (Wed, 27 Jan 2010) New Revision: 938 Log: Implemented Groonga::Column#lock/unlock/clear_lock/locked?. Modified files: groonga/trunk/ext/rb-grn-column.c Modified: groonga/trunk/ext/rb-grn-column.c (+196 -0) =================================================================== --- groonga/trunk/ext/rb-grn-column.c 2010-01-27 15:34:20 +09:00 (rev 937) +++ groonga/trunk/ext/rb-grn-column.c 2010-01-27 22:00:35 +09:00 (rev 938) @@ -1,4 +1,5 @@ /* -*- c-file-style: "ruby" -*- */ +/* vim: set sts=4 sw=4 ts=8 noet: */ /* Copyright (C) 2009 Kouhei Sutou @@ -354,6 +355,197 @@ return rb_result; } +/* + * Document-method: unlock + * + * call-seq: + * column.unlock(options={}) + * + * _column_?????????? + * + * ????????????????? + * + * [_:id_] + * _:id_?????????????????????: + * groonga?????????????????? + */ +static VALUE +rb_grn_column_unlock (int argc, VALUE *argv, VALUE self) +{ + grn_id id = GRN_ID_NIL; + grn_ctx *context; + grn_obj *column; + grn_rc rc; + VALUE options, rb_id; + + rb_scan_args(argc, argv, "01", &options); + + rb_grn_column_deconstruct(SELF(self), &column, &context, + NULL, NULL, + NULL, NULL, NULL); + + rb_grn_scan_options(options, + "id", &rb_id, + NULL); + + if (!NIL_P(rb_id)) + id = NUM2UINT(rb_id); + + rc = grn_obj_unlock(context, column, id); + rb_grn_context_check(context, self); + rb_grn_rc_check(rc, self); + + return Qnil; +} + +static VALUE +rb_grn_column_unlock_ensure (VALUE self) +{ + return rb_grn_column_unlock(0, NULL, self); +} + +/* + * Document-method: lock + * + * call-seq: + * column.lock(options={}) + * column.lock(options={}) {...} + * + * _column_?????????????????? + * Groonga::ResourceDeadlockAvoided???????? + * + * ???????????????????????unlock??? + * + * ????????????????? + * + * [_:timeout_] + * ???????????????_:timeout_??????? + * ??????_:timeout_???????????????? + * ??????????? + * [_:id_] + * _:id_??????????????????: groonga?? + * ???????????????? + */ +static VALUE +rb_grn_column_lock (int argc, VALUE *argv, VALUE self) +{ + grn_id id = GRN_ID_NIL; + grn_ctx *context; + grn_obj *column; + int timeout = 0; + grn_rc rc; + VALUE options, rb_timeout, rb_id; + + rb_scan_args(argc, argv, "01", &options); + + rb_grn_column_deconstruct(SELF(self), &column, &context, + NULL, NULL, + NULL, NULL, NULL); + + rb_grn_scan_options(options, + "timeout", &rb_timeout, + "id", &rb_id, + NULL); + + if (!NIL_P(rb_timeout)) + timeout = NUM2UINT(rb_timeout); + + if (!NIL_P(rb_id)) + id = NUM2UINT(rb_id); + + rc = grn_obj_lock(context, column, id, timeout); + rb_grn_context_check(context, self); + rb_grn_rc_check(rc, self); + + if (rb_block_given_p()) { + return rb_ensure(rb_yield, Qnil, rb_grn_column_unlock_ensure, self); + } else { + return Qnil; + } +} + +/* + * Document-method: clear_lock + * + * call-seq: + * column.clear_lock(options={}) + * + * _column_?????????????? + * + * ????????????????? + * + * [_:id_] + * _:id_??????????????????????? + * ??: groonga????????????????????? + * ??????????????????????????? + * ??? + */ +static VALUE +rb_grn_column_clear_lock (int argc, VALUE *argv, VALUE self) +{ + grn_id id = GRN_ID_NIL; + grn_ctx *context; + grn_obj *column; + VALUE options, rb_id; + + rb_scan_args(argc, argv, "01", &options); + + rb_grn_column_deconstruct(SELF(self), &column, &context, + NULL, NULL, + NULL, NULL, NULL); + + rb_grn_scan_options(options, + "id", &rb_id, + NULL); + + if (!NIL_P(rb_id)) + id = NUM2UINT(rb_id); + + grn_obj_clear_lock(context, column); + + return Qnil; +} + +/* + * Document-method: locked? + * + * call-seq: + * column.locked?(options={}) + * + * _column_??????????+true+???? + * + * ????????????????? + * + * [_:id_] + * _:id_???????????????????+true+???? + * ??: groonga????????????????????? + * ??????????????????????????? + * ??? + */ +static VALUE +rb_grn_column_is_locked (int argc, VALUE *argv, VALUE self) +{ + grn_id id = GRN_ID_NIL; + grn_ctx *context; + grn_obj *column; + VALUE options, rb_id; + + rb_scan_args(argc, argv, "01", &options); + + rb_grn_column_deconstruct(SELF(self), &column, &context, + NULL, NULL, + NULL, NULL, NULL); + + rb_grn_scan_options(options, + "id", &rb_id, + NULL); + + if (!NIL_P(rb_id)) + id = NUM2UINT(rb_id); + + return CBOOL2RVAL(grn_obj_is_locked(context, column)); +} + void rb_grn_init_column (VALUE mGrn) { @@ -364,6 +556,10 @@ rb_grn_column_get_local_name, 0); rb_define_method(rb_cGrnColumn, "select", rb_grn_column_select, -1); + rb_define_method(rb_cGrnColumn, "lock", rb_grn_column_lock, -1); + 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_grn_init_fix_size_column(mGrn); rb_grn_init_variable_size_column(mGrn); From null at cozmixng.org Thu Jan 28 00:00:47 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 28 Jan 2010 14:00:47 +0900 Subject: [groonga-commit:891] groonga [groonga (trunk) r939] * show related object for debugging. Message-ID: <20100128050047.4FF611D1C1F@mail.cozmixng.org> retro 2010-01-28 14:00:46 +0900 (Thu, 28 Jan 2010) New Revision: 939 Log: * show related object for debugging. Modified files: groonga/trunk/ext/rb-grn-object.c groonga/trunk/ext/rb-grn-utils.c groonga/trunk/ext/rb-grn.h Modified: groonga/trunk/ext/rb-grn-object.c (+2 -2) =================================================================== --- groonga/trunk/ext/rb-grn-object.c 2010-01-27 21:59:13 +09:00 (rev 938) +++ groonga/trunk/ext/rb-grn-object.c 2010-01-28 14:00:46 +09:00 (rev 939) @@ -1,6 +1,6 @@ /* -*- c-file-style: "ruby" -*- */ /* - Copyright (C) 2009 Kouhei Sutou + Copyright (C) 2009-2010 Kouhei Sutou This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -1055,7 +1055,7 @@ case GRN_TABLE_VIEW: GRN_OBJ_INIT(&value, GRN_UVECTOR, 0, rb_grn_object->object->header.domain); - RVAL2GRNUVECTOR(rb_value, context, &value); + RVAL2GRNUVECTOR(rb_value, context, &value, self); break; default: GRN_OBJ_INIT(&value, GRN_VECTOR, 0, GRN_ID_NIL); Modified: groonga/trunk/ext/rb-grn-utils.c (+4 -3) =================================================================== --- groonga/trunk/ext/rb-grn-utils.c 2010-01-27 21:59:13 +09:00 (rev 938) +++ groonga/trunk/ext/rb-grn-utils.c 2010-01-28 14:00:46 +09:00 (rev 939) @@ -491,7 +491,7 @@ grn_obj * rb_grn_uvector_from_ruby_object (VALUE object, grn_ctx *context, - grn_obj *uvector) + grn_obj *uvector, VALUE related_object) { VALUE *values; int i, n; @@ -518,9 +518,10 @@ grn_obj_close(context, uvector); rb_raise(rb_eArgError, "uvector value should be one of " - "[Fixnum, Groonga::Record]: %s (%s)", + "[Fixnum, Groonga::Record]: %s (%s): %s", rb_grn_inspect(value), - rb_grn_inspect(object)); + rb_grn_inspect(object), + rb_grn_inspect(related_object)); } break; } Modified: groonga/trunk/ext/rb-grn.h (+5 -4) =================================================================== --- groonga/trunk/ext/rb-grn.h 2010-01-27 21:59:13 +09:00 (rev 938) +++ groonga/trunk/ext/rb-grn.h 2010-01-28 14:00:46 +09:00 (rev 939) @@ -1,6 +1,6 @@ /* -*- c-file-style: "ruby" -*- */ /* - Copyright (C) 2009 Kouhei Sutou + Copyright (C) 2009-2010 Kouhei Sutou This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -459,8 +459,8 @@ #define GRNVECTOR2RVAL(context, vector) \ (rb_grn_vector_to_ruby_object(context, vector)) -#define RVAL2GRNUVECTOR(object, context, uvector) \ - (rb_grn_uvector_from_ruby_object(object, context, uvector)) +#define RVAL2GRNUVECTOR(object, context, uvector, related_object) \ + (rb_grn_uvector_from_ruby_object(object, context, uvector, related_object)) #define GRNUVECTOR2RVAL(context, uvector) \ (rb_grn_uvector_to_ruby_object(context, uvector)) @@ -572,7 +572,8 @@ grn_obj *vector); grn_obj *rb_grn_uvector_from_ruby_object (VALUE object, grn_ctx *context, - grn_obj *uvector); + grn_obj *uvector, + VALUE related_object); VALUE rb_grn_uvector_to_ruby_object (grn_ctx *context, grn_obj *uvector); From null at cozmixng.org Thu Jan 28 00:15:58 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 28 Jan 2010 14:15:58 +0900 Subject: [groonga-commit:892] groonga [groonga (trunk) r940] * simply object inspection result. Message-ID: <20100128051558.F06461D1C15@mail.cozmixng.org> retro 2010-01-28 14:15:46 +0900 (Thu, 28 Jan 2010) New Revision: 940 Log: * simply object inspection result. Modified files: groonga/trunk/ext/rb-grn-object.c groonga/trunk/test/test-array.rb groonga/trunk/test/test-fix-size-column.rb groonga/trunk/test/test-hash.rb groonga/trunk/test/test-schema.rb groonga/trunk/test/test-type.rb groonga/trunk/test/test-variable-size-column.rb Modified: groonga/trunk/test/test-schema.rb (+10 -11) =================================================================== --- groonga/trunk/test/test-schema.rb 2010-01-28 13:48:28 +09:00 (rev 939) +++ groonga/trunk/test/test-schema.rb 2010-01-28 14:15:46 +09:00 (rev 940) @@ -69,8 +69,8 @@ "id: <#{table.id}>, " + "name: , " + "path: <#{path}>, " + - "domain: <#{context['Int32'].inspect}>, " + - "range: <#{type.inspect}>, " + + "domain: , " + + "range: , " + "flags: <>, " + "encoding: <#{Groonga::Encoding.default.inspect}>, " + "size: <0>>", @@ -101,8 +101,8 @@ "id: <#{table.id}>, " + "name: , " + "path: <#{path}>, " + - "domain: <#{context[''].inspect}>, " + - "range: <#{type.inspect}>, " + + "domain: , " + + "range: , " + "flags: , " + "encoding: <#{Groonga::Encoding.default.inspect}>, " + "size: <0>>", @@ -129,8 +129,8 @@ "id: <#{table.id}>, " + "name: , " + "path: <#{path}>, " + - "domain: <#{type.inspect}>, " + - "range: <#{type.inspect}>, " + + "domain: , " + + "range: , " + "flags: <>, " + "size: <0>>", table.inspect) @@ -148,15 +148,14 @@ :compress => :lzo) end - table = context["Posts"] column_name = "Posts.rate" column = context[column_name] assert_equal("#, " + "name: <#{column_name}>, " + "path: <#{path}>, " + - "domain: <#{table.inspect}>, " + - "range: <#{type.inspect}>, " + + "domain: , " + + "range: , " + "flags: >", column.inspect) end @@ -307,8 +306,8 @@ "id: <#{index_column.id}>, " + "name: <#{full_index_column_name}>, " + "path: <#{path}>, " + - "domain: <#{terms.inspect}>, " + - "range: <#{posts.inspect}>, " + + "domain: , " + + "range: , " + "flags: >", Modified: groonga/trunk/test/test-fix-size-column.rb (+2 -2) =================================================================== --- groonga/trunk/test/test-fix-size-column.rb 2010-01-28 13:48:28 +09:00 (rev 939) +++ groonga/trunk/test/test-fix-size-column.rb 2010-01-28 14:15:46 +09:00 (rev 940) @@ -37,8 +37,8 @@ "id: <#{@viewed.id}>, " + "name: , " + "path: <#{@viewed_column_path}>, " + - "domain: <#{@bookmarks.inspect}>, " + - "range: <#{context['Int32'].inspect}>, " + + "domain: , " + + "range: , " + "flags: " + ">", @viewed.inspect) Modified: groonga/trunk/ext/rb-grn-object.c (+32 -12) =================================================================== --- groonga/trunk/ext/rb-grn-object.c 2010-01-28 13:48:28 +09:00 (rev 939) +++ groonga/trunk/ext/rb-grn-object.c 2010-01-28 14:15:46 +09:00 (rev 940) @@ -481,12 +481,12 @@ } static VALUE -rb_grn_object_inspect_content_name (VALUE inspected, - grn_ctx *context, grn_obj *object) +rb_grn_object_inspect_content_name_without_label (VALUE inspected, + grn_ctx *context, + grn_obj *object) { int name_size; - rb_str_cat2(inspected, "name: "); name_size = grn_obj_name(context, object, NULL, 0); if (name_size == 0) { rb_str_cat2(inspected, "(anonymous)"); @@ -507,6 +507,16 @@ } static VALUE +rb_grn_object_inspect_content_name (VALUE inspected, + grn_ctx *context, grn_obj *object) +{ + + rb_str_cat2(inspected, "name: "); + rb_grn_object_inspect_content_name_without_label(inspected, context, object); + return inspected; +} + +static VALUE rb_grn_object_inspect_content_path (VALUE inspected, grn_ctx *context, grn_obj *object) { @@ -533,24 +543,26 @@ rb_str_cat2(inspected, "domain: "); domain = object->header.domain; - rb_str_cat2(inspected, "<"); if (domain == GRN_ID_NIL) { - rb_str_cat2(inspected, "nil"); + rb_str_cat2(inspected, "(nil)"); } else { grn_obj *domain_object; domain_object = grn_ctx_at(context, domain); if (domain_object) { if (domain_object == object) { - rb_str_cat2(inspected, "self"); + rb_str_cat2(inspected, "(self)"); } else { - rb_grn_object_inspect_object(inspected, context, domain_object); + rb_grn_object_inspect_content_name_without_label(inspected, + context, + domain_object); } } else { + rb_str_cat2(inspected, "("); rb_str_concat(inspected, rb_obj_as_string(UINT2NUM(domain))); + rb_str_cat2(inspected, ")"); } } - rb_str_cat2(inspected, ">"); return inspected; } @@ -564,26 +576,34 @@ rb_str_cat2(inspected, "range: "); range = grn_obj_get_range(context, object); - rb_str_cat2(inspected, "<"); switch (object->header.type) { case GRN_TYPE: + rb_str_cat2(inspected, "<"); rb_str_concat(inspected, rb_inspect(UINT2NUM(range))); + rb_str_cat2(inspected, ">"); break; default: if (range == GRN_ID_NIL) { - rb_str_cat2(inspected, "nil"); + rb_str_cat2(inspected, "(nil)"); } else { grn_obj *range_object; range_object = grn_ctx_at(context, range); if (range_object) { - rb_grn_object_inspect_object(inspected, context, range_object); + if (range_object == object) { + rb_str_cat2(inspected, "(self)"); + } else { + rb_grn_object_inspect_content_name_without_label(inspected, + context, + range_object); + } } else { + rb_str_cat2(inspected, "("); rb_str_concat(inspected, rb_obj_as_string(UINT2NUM(range))); + rb_str_cat2(inspected, ")"); } } } - rb_str_cat2(inspected, ">"); return inspected; } Modified: groonga/trunk/test/test-type.rb (+1 -1) =================================================================== --- groonga/trunk/test/test-type.rb 2010-01-28 13:48:28 +09:00 (rev 939) +++ groonga/trunk/test/test-type.rb 2010-01-28 14:15:46 +09:00 (rev 940) @@ -46,7 +46,7 @@ assert_equal("#, " + "name: , " + "path: (temporary), " + - "domain: , " + + "domain: (nil), " + "range: <2147483648>, " + "flags: <>>", context[""].inspect) Modified: groonga/trunk/test/test-variable-size-column.rb (+2 -2) =================================================================== --- groonga/trunk/test/test-variable-size-column.rb 2010-01-28 13:48:28 +09:00 (rev 939) +++ groonga/trunk/test/test-variable-size-column.rb 2010-01-28 14:15:46 +09:00 (rev 940) @@ -55,8 +55,8 @@ "id: <#{@name.id}>, " + "name: , " + "path: <#{@users_name_column_path}>, " + - "domain: <#{@users.inspect}>, " + - "range: <#{context[''].inspect}>, " + + "domain: , " + + "range: , " + "flags: <>" + ">", @name.inspect) Modified: groonga/trunk/test/test-hash.rb (+8 -8) =================================================================== --- groonga/trunk/test/test-hash.rb 2010-01-28 13:48:28 +09:00 (rev 939) +++ groonga/trunk/test/test-hash.rb 2010-01-28 14:15:46 +09:00 (rev 940) @@ -69,8 +69,8 @@ "id: <#{anonymous_table.id}>, " + "name: (anonymous), " + "path: <#{path}>, " + - "domain: , " + - "range: , " + + "domain: (nil), " + + "range: (nil), " + "flags: <>, " + "encoding: <#{encoding.inspect}>, " + "size: <0>>", @@ -83,8 +83,8 @@ "id: <#{anonymous_table.id}>, " + "name: (anonymous), " + "path: (temporary), " + - "domain: , " + - "range: , " + + "domain: (nil), " + + "range: (nil), " + "flags: <>, " + "encoding: <#{encoding.inspect}>, " + "size: <0>>", @@ -98,8 +98,8 @@ "id: <#{named_table.id}>, " + "name: , " + "path: <#{path}>, " + - "domain: , " + - "range: , " + + "domain: (nil), " + + "range: (nil), " + "flags: <>, " + "encoding: <#{encoding.inspect}>, " + "size: <0>>", @@ -112,8 +112,8 @@ "id: <#{named_table.id}>, " + "name: (anonymous), " + "path: (temporary), " + - "domain: , " + - "range: , " + + "domain: (nil), " + + "range: (nil), " + "flags: <>, " + "encoding: <#{encoding.inspect}>, " + "size: <0>>", Modified: groonga/trunk/test/test-array.rb (+2 -2) =================================================================== --- groonga/trunk/test/test-array.rb 2010-01-28 13:48:28 +09:00 (rev 939) +++ groonga/trunk/test/test-array.rb 2010-01-28 14:15:46 +09:00 (rev 940) @@ -28,8 +28,8 @@ "id: <#{contain_table.id}>, " + "name: , " + "path: <#{path}>, " + - "domain: , " + - "range: , " + + "domain: (nil), " + + "range: (nil), " + "flags: <>, " + "size: <3>>", contain_table.inspect) From null at cozmixng.org Thu Jan 28 00:16:03 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 28 Jan 2010 14:16:03 +0900 Subject: [groonga-commit:893] groonga [groonga (trunk) r941] * clean names up. Message-ID: <20100128051603.82E951D1C1F@mail.cozmixng.org> retro 2010-01-28 14:16:01 +0900 (Thu, 28 Jan 2010) New Revision: 941 Log: * clean names up. Modified files: groonga/trunk/ext/rb-grn-object.c Modified: groonga/trunk/ext/rb-grn-object.c (+28 -28) =================================================================== --- groonga/trunk/ext/rb-grn-object.c 2010-01-28 14:04:22 +09:00 (rev 940) +++ groonga/trunk/ext/rb-grn-object.c 2010-01-28 14:16:01 +09:00 (rev 941) @@ -464,8 +464,8 @@ } static VALUE -rb_grn_object_inspect_content_id (VALUE inspected, - grn_ctx *context, grn_obj *object) +rb_grn_object_inspect_content_id_with_label (VALUE inspected, + grn_ctx *context, grn_obj *object) { grn_id id; @@ -481,9 +481,8 @@ } static VALUE -rb_grn_object_inspect_content_name_without_label (VALUE inspected, - grn_ctx *context, - grn_obj *object) +rb_grn_object_inspect_content_name (VALUE inspected, + grn_ctx *context, grn_obj *object) { int name_size; @@ -507,18 +506,18 @@ } static VALUE -rb_grn_object_inspect_content_name (VALUE inspected, - grn_ctx *context, grn_obj *object) +rb_grn_object_inspect_content_name_with_label (VALUE inspected, + grn_ctx *context, grn_obj *object) { rb_str_cat2(inspected, "name: "); - rb_grn_object_inspect_content_name_without_label(inspected, context, object); + rb_grn_object_inspect_content_name(inspected, context, object); return inspected; } static VALUE -rb_grn_object_inspect_content_path (VALUE inspected, - grn_ctx *context, grn_obj *object) +rb_grn_object_inspect_content_path_with_label (VALUE inspected, + grn_ctx *context, grn_obj *object) { const char *path; @@ -536,8 +535,9 @@ } static VALUE -rb_grn_object_inspect_content_domain (VALUE inspected, - grn_ctx *context, grn_obj *object) +rb_grn_object_inspect_content_domain_with_label (VALUE inspected, + grn_ctx *context, + grn_obj *object) { grn_id domain; @@ -553,9 +553,8 @@ if (domain_object == object) { rb_str_cat2(inspected, "(self)"); } else { - rb_grn_object_inspect_content_name_without_label(inspected, - context, - domain_object); + rb_grn_object_inspect_content_name(inspected, + context, domain_object); } } else { rb_str_cat2(inspected, "("); @@ -568,8 +567,9 @@ } static VALUE -rb_grn_object_inspect_content_range (VALUE inspected, - grn_ctx *context, grn_obj *object) +rb_grn_object_inspect_content_range_with_label (VALUE inspected, + grn_ctx *context, + grn_obj *object) { grn_id range; @@ -593,9 +593,8 @@ if (range_object == object) { rb_str_cat2(inspected, "(self)"); } else { - rb_grn_object_inspect_content_name_without_label(inspected, - context, - range_object); + rb_grn_object_inspect_content_name(inspected, + context, range_object); } } else { rb_str_cat2(inspected, "("); @@ -609,8 +608,9 @@ } static VALUE -rb_grn_object_inspect_content_flags (VALUE inspected, - grn_ctx *context, grn_obj *object) +rb_grn_object_inspect_content_flags_with_label (VALUE inspected, + grn_ctx *context, + grn_obj *object) { grn_obj_flags flags; VALUE inspected_flags; @@ -718,17 +718,17 @@ rb_grn_object_inspect_object_content (VALUE inspected, grn_ctx *context, grn_obj *object) { - rb_grn_object_inspect_content_id(inspected, context, object); + rb_grn_object_inspect_content_id_with_label(inspected, context, object); rb_str_cat2(inspected, ", "); - rb_grn_object_inspect_content_name(inspected, context, object); + rb_grn_object_inspect_content_name_with_label(inspected, context, object); rb_str_cat2(inspected, ", "); - rb_grn_object_inspect_content_path(inspected, context, object); + rb_grn_object_inspect_content_path_with_label(inspected, context, object); rb_str_cat2(inspected, ", "); - rb_grn_object_inspect_content_domain(inspected, context, object); + rb_grn_object_inspect_content_domain_with_label(inspected, context, object); rb_str_cat2(inspected, ", "); - rb_grn_object_inspect_content_range(inspected, context, object); + rb_grn_object_inspect_content_range_with_label(inspected, context, object); rb_str_cat2(inspected, ", "); - rb_grn_object_inspect_content_flags(inspected, context, object); + rb_grn_object_inspect_content_flags_with_label(inspected, context, object); return inspected; } From null at cozmixng.org Thu Jan 28 01:45:40 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 28 Jan 2010 15:45:40 +0900 Subject: [groonga-commit:894] groonga [groonga (trunk) r942] * re-support add vector value with range table's key value. Message-ID: <20100128064540.353351D1C20@mail.cozmixng.org> retro 2010-01-28 15:45:39 +0900 (Thu, 28 Jan 2010) New Revision: 942 Log: * re-support add vector value with range table's key value. Modified files: groonga/trunk/ext/rb-grn-object.c groonga/trunk/test/test-vector-column.rb Modified: groonga/trunk/ext/rb-grn-object.c (+33 -8) =================================================================== --- groonga/trunk/ext/rb-grn-object.c 2010-01-28 14:13:43 +09:00 (rev 941) +++ groonga/trunk/ext/rb-grn-object.c 2010-01-28 15:45:39 +09:00 (rev 942) @@ -1051,6 +1051,37 @@ return rb_value; } +static rb_grn_boolean +rb_uvector_value_p (RbGrnObject *rb_grn_object, VALUE rb_value) +{ + VALUE first_element; + + switch (rb_grn_object->range->header.type) { + case GRN_TYPE: + /* TODO: support not sizeof(grn_id) uvector. */ + /* + if (!(rb_grn_object->range->header.flags | GRN_OBJ_KEY_VAR_SIZE)) { + return RB_GRN_TRUE; + } + */ + break; + case GRN_TABLE_HASH_KEY: + case GRN_TABLE_PAT_KEY: + case GRN_TABLE_NO_KEY: + case GRN_TABLE_VIEW: + first_element = rb_ary_entry(rb_value, 0); + if (RVAL2CBOOL(rb_obj_is_kind_of(first_element, rb_cGrnRecord))) { + return RB_GRN_TRUE; + } + break; + default: + break; + } + + return RB_GRN_FALSE; +} + + static VALUE rb_grn_object_set (VALUE self, VALUE rb_id, VALUE rb_value, int flags) { @@ -1068,19 +1099,13 @@ context = rb_grn_object->context; id = NUM2UINT(rb_id); if (RVAL2CBOOL(rb_obj_is_kind_of(rb_value, rb_cArray))) { - switch (rb_grn_object->range->header.type) { - case GRN_TABLE_HASH_KEY: - case GRN_TABLE_PAT_KEY: - case GRN_TABLE_NO_KEY: - case GRN_TABLE_VIEW: + if (rb_uvector_value_p(rb_grn_object, rb_value)) { GRN_OBJ_INIT(&value, GRN_UVECTOR, 0, rb_grn_object->object->header.domain); RVAL2GRNUVECTOR(rb_value, context, &value, self); - break; - default: + } else { GRN_OBJ_INIT(&value, GRN_VECTOR, 0, GRN_ID_NIL); RVAL2GRNVECTOR(rb_value, context, &value); - break; } } else { GRN_OBJ_INIT(&value, GRN_BULK, 0, GRN_ID_NIL); Modified: groonga/trunk/test/test-vector-column.rb (+18 -1) =================================================================== --- groonga/trunk/test/test-vector-column.rb 2010-01-28 14:13:43 +09:00 (rev 941) +++ groonga/trunk/test/test-vector-column.rb 2010-01-28 15:45:39 +09:00 (rev 942) @@ -33,13 +33,20 @@ :key_type => "ShortText") do |table| table.reference("users", "Users", :type => :vector) end + + schema.create_table("Areas", + :type => :hash, + :key_type => "ShortText") do |table| + table.reference("communities", "Communities", :type => :vector) + end end @users = Groonga::Context.default["Users"] @communities = Groonga::Context.default["Communities"] + @areas = Groonga::Context.default["Areas"] end - def test_set_and_get + def test_set_records groonga = @communities.add("groonga") morita = @users.add(29) groonga["users"] = [morita] @@ -47,4 +54,14 @@ assert_equal([29], @users.collect {|record| record.key}) assert_equal([29], groonga["users"].collect {|record| record.key}) end + + def test_set_nonexistent_keys + shinjuku = @areas.add("Shinjuku") + shinjuku["communities"] = ["groonga", "Senna"] + + assert_equal(["groonga", "Senna"], + @communities.collect {|record| record.key}) + assert_equal(["groonga", "Senna"], + shinjuku["communities"].collect {|record| record.key}) + end end From null at cozmixng.org Thu Jan 28 03:30:50 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 28 Jan 2010 17:30:50 +0900 Subject: [groonga-commit:895] groonga [groonga (trunk) r943] * add Groonga::Object#temporary? and #persistent?. Message-ID: <20100128083050.653851D1C1B@mail.cozmixng.org> retro 2010-01-28 17:30:49 +0900 (Thu, 28 Jan 2010) New Revision: 943 Log: * add Groonga::Object#temporary? and #persistent?. Modified files: groonga/trunk/ext/rb-grn-object.c groonga/trunk/test/test-table.rb Modified: groonga/trunk/ext/rb-grn-object.c (+52 -0) =================================================================== --- groonga/trunk/ext/rb-grn-object.c 2010-01-28 15:38:51 +09:00 (rev 942) +++ groonga/trunk/ext/rb-grn-object.c 2010-01-28 17:30:49 +09:00 (rev 943) @@ -840,6 +840,54 @@ } /* + * Document-method: temporary? + * + * call-seq: + * object.temporary? -> true/false + * + * _object_???????????+true+?????????? + * ?+false+???? + */ +static VALUE +rb_grn_object_temporary_p (VALUE self) +{ + RbGrnObject *rb_grn_object; + const char *path; + + rb_grn_object = SELF(self); + if (!rb_grn_object->object) + return Qnil; + + path = grn_obj_path(rb_grn_object->context, rb_grn_object->object); + + return path ? Qfalse : Qtrue; +} + +/* + * Document-method: persistent? + * + * call-seq: + * object.persistent? -> true/false + * + * _object_???????????+true+?????????? + * ?+false+???? + */ +static VALUE +rb_grn_object_persistent_p (VALUE self) +{ + RbGrnObject *rb_grn_object; + const char *path; + + rb_grn_object = SELF(self); + if (!rb_grn_object->object) + return Qnil; + + path = grn_obj_path(rb_grn_object->context, rb_grn_object->object); + + return path ? Qtrue : Qfalse; +} + +/* * Document-method: domain * * call-seq: @@ -1210,6 +1258,10 @@ rb_define_method(rb_cGrnObject, "range", rb_grn_object_get_range, 0); rb_define_method(rb_cGrnObject, "path", rb_grn_object_get_path, 0); + rb_define_method(rb_cGrnObject, "temporary?", rb_grn_object_temporary_p, 0); + rb_define_method(rb_cGrnObject, "persistent?", + rb_grn_object_persistent_p, 0); + rb_define_method(rb_cGrnObject, "==", rb_grn_object_equal, 1); rb_define_method(rb_cGrnObject, "close", rb_grn_object_close, 0); Modified: groonga/trunk/test/test-table.rb (+7 -15) =================================================================== --- groonga/trunk/test/test-table.rb 2010-01-28 15:38:51 +09:00 (rev 942) +++ groonga/trunk/test/test-table.rb 2010-01-28 17:30:49 +09:00 (rev 943) @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Kouhei Sutou +# Copyright (C) 2009-2010 Kouhei Sutou # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -30,6 +30,8 @@ def test_temporary table = Groonga::PatriciaTrie.create assert_nil(table.name) + assert_predicate(table, :temporary?) + assert_not_predicate(table, :persistent?) assert_equal([], @tables_dir.children) end @@ -118,25 +120,20 @@ end def test_define_column_default_persistent - path_is_temporary = "name: , path: \(temporary\)" - bookmarks = Groonga::Hash.create(:name => "Bookmarks") real_name = bookmarks.define_column("real_name", "ShortText") - assert_equal(nil, real_name.inspect.index(path_is_temporary)) + assert_predicate(real_name, :persistent?) end def test_define_column_not_persistent - path_is_temporary = "name: , path: \(temporary\)" - bookmarks = Groonga::Hash.create(:name => "Bookmarks") real_name = bookmarks.define_column("real_name", "ShortText", :persistent => false) - assert_not_equal(nil, real_name.inspect.index(path_is_temporary)) + assert_predicate(real_name, :temporary?) end def test_define_column_not_persistent_and_path column_path = @tables_dir + "bookmakrs.real_name.column" - path_is_temporary = "name: , path: \(temporary\)" bookmarks = Groonga::Hash.create(:name => "Bookmarks") message = "should not pass :path if :persistent is false: <#{column_path}>" @@ -148,27 +145,22 @@ end def test_define_index_column_default_persistent - path_is_temporary = "name: , path: \(temporary\)" - bookmarks = Groonga::Hash.create(:name => "Bookmarks") terms = Groonga::Hash.create(:name => "Terms") real_name = terms.define_index_column("real_name", bookmarks) - assert_equal(nil, real_name.inspect.index(path_is_temporary)) + assert_predicate(real_name, :persistent?) end def test_define_index_column_not_persistent - path_is_temporary = "name: , path: \(temporary\)" - bookmarks = Groonga::Hash.create(:name => "Bookmarks") terms = Groonga::Hash.create(:name => "Terms") real_name = terms.define_index_column("real_name", bookmarks, :persistent => false) - assert_not_equal(nil, real_name.inspect.index(path_is_temporary)) + assert_predicate(real_name, :temporary?) end def test_define_index_column_not_persistent_and_path column_path = @tables_dir + "bookmakrs.real_name.column" - path_is_temporary = "name: , path: \(temporary\)" bookmarks = Groonga::Hash.create(:name => "Bookmarks") terms = Groonga::Hash.create(:name => "Terms") From null at cozmixng.org Thu Jan 28 03:45:53 2010 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 28 Jan 2010 17:45:53 +0900 Subject: [groonga-commit:896] groonga [groonga (trunk) r944] * define temporary column on temporary table by default. Message-ID: <20100128084553.B16741D1C1C@mail.cozmixng.org> retro 2010-01-28 17:45:53 +0900 (Thu, 28 Jan 2010) New Revision: 944 Log: * define temporary column on temporary table by default. Modified files: groonga/trunk/ext/rb-grn-table.c groonga/trunk/test/test-table.rb Modified: groonga/trunk/ext/rb-grn-table.c (+6 -2) =================================================================== --- groonga/trunk/ext/rb-grn-table.c 2010-01-28 17:23:35 +09:00 (rev 943) +++ groonga/trunk/ext/rb-grn-table.c 2010-01-28 17:45:53 +09:00 (rev 944) @@ -460,8 +460,10 @@ value_type = RVAL2GRNOBJECT(rb_value_type, &context); - if (NIL_P(rb_persistent) || RVAL2CBOOL(rb_persistent)) + if ((NIL_P(rb_persistent) && grn_obj_path(context, table)) || + RVAL2CBOOL(rb_persistent)) { flags |= GRN_OBJ_PERSISTENT; + } if (!NIL_P(rb_path)) { path = StringValueCStr(rb_path); @@ -571,8 +573,10 @@ value_type = RVAL2GRNOBJECT(rb_value_type, &context); - if (NIL_P(rb_persistent) || RVAL2CBOOL(rb_persistent)) + if ((NIL_P(rb_persistent) && grn_obj_path(context, table)) || + RVAL2CBOOL(rb_persistent)) { flags |= GRN_OBJ_PERSISTENT; + } if (!NIL_P(rb_path)) { path = StringValueCStr(rb_path); Modified: groonga/trunk/test/test-table.rb (+13 -0) =================================================================== --- groonga/trunk/test/test-table.rb 2010-01-28 17:23:35 +09:00 (rev 943) +++ groonga/trunk/test/test-table.rb 2010-01-28 17:45:53 +09:00 (rev 944) @@ -119,6 +119,19 @@ assert_equal(column, table.column("name")) end + def test_temporary_table_define_column_default_persistent + table = Groonga::Hash.create + name = table.define_column("name", "ShortText") + assert_predicate(name, :temporary?) + end + + def test_temporary_table_define_index_column_default_persistent + bookmarks = Groonga::Hash.create(:name => "Bookmarks") + terms = Groonga::Hash.create + url = terms.define_index_column("url", bookmarks) + assert_predicate(url, :temporary?) + end + def test_define_column_default_persistent bookmarks = Groonga::Hash.create(:name => "Bookmarks") real_name = bookmarks.define_column("real_name", "ShortText")