Kouhei Sutou
null+****@clear*****
Tue Oct 9 11:53:53 JST 2012
Kouhei Sutou 2012-10-09 11:53:53 +0900 (Tue, 09 Oct 2012) New Revision: 128203fda2df578f255120c7d5c20d8d6c191fda https://github.com/groonga/groonga/commit/128203fda2df578f255120c7d5c20d8d6c191fda Log: Move Cutter tests to grntest tests Tests for --query_expansion with --query '"with space"' is moved. Added files: test/command/suite/select/query_expansion/scalar/with_space.expected test/command/suite/select/query_expansion/scalar/with_space.test test/command/suite/select/query_expansion/vector/with_space.expected test/command/suite/select/query_expansion/vector/with_space.test Modified files: test/unit/core/test-command-select-query-expansion.c Added: test/command/suite/select/query_expansion/scalar/with_space.expected (+55 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/query_expansion/scalar/with_space.expected 2012-10-09 11:53:53 +0900 (b2053d2) @@ -0,0 +1,55 @@ +table_create Memos TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Memos content COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Lexicon TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram +[[0,0.0,0.0],true] +column_create Lexicon diary_content COLUMN_INDEX|WITH_POSITION Memos content +[[0,0.0,0.0],true] +table_create Synonyms TABLE_PAT_KEY ShortText +[[0,0.0,0.0],true] +column_create Synonyms words COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Memos +[ +["content"], +["Start groonga!"], +["Start mroonga!"], +["Start rroonga!"] +] +[[0,0.0,0.0],3] +load --table Synonyms +[ +["_key", "words"], +["groonga storage engine", "(\"groonga storage engine\" OR mroonga)"] +] +[[0,0.0,0.0],1] +select --table Memos --query_expansion Synonyms.words --match_columns content --query '"groonga storage engine"' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 1 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "content", + "ShortText" + ] + ], + [ + 2, + "Start mroonga!" + ] + ] + ] +] Added: test/command/suite/select/query_expansion/scalar/with_space.test (+25 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/query_expansion/scalar/with_space.test 2012-10-09 11:53:53 +0900 (96608bb) @@ -0,0 +1,25 @@ +table_create Memos TABLE_NO_KEY +column_create Memos content COLUMN_SCALAR ShortText + +table_create Lexicon TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram +column_create Lexicon diary_content COLUMN_INDEX|WITH_POSITION Memos content + +table_create Synonyms TABLE_PAT_KEY ShortText +column_create Synonyms words COLUMN_SCALAR ShortText + +load --table Memos +[ +["content"], +["Start groonga!"], +["Start mroonga!"], +["Start rroonga!"] +] + +load --table Synonyms +[ +["_key", "words"], +["groonga storage engine", "(\"groonga storage engine\" OR mroonga)"] +] + +select --table Memos --query_expansion Synonyms.words \ + --match_columns content --query '"groonga storage engine"' Added: test/command/suite/select/query_expansion/vector/with_space.expected (+55 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/query_expansion/vector/with_space.expected 2012-10-09 11:53:53 +0900 (22330af) @@ -0,0 +1,55 @@ +table_create Memos TABLE_NO_KEY +[[0,0.0,0.0],true] +column_create Memos content COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +table_create Lexicon TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram +[[0,0.0,0.0],true] +column_create Lexicon diary_content COLUMN_INDEX|WITH_POSITION Memos content +[[0,0.0,0.0],true] +table_create Synonyms TABLE_PAT_KEY ShortText +[[0,0.0,0.0],true] +column_create Synonyms words COLUMN_VECTOR ShortText +[[0,0.0,0.0],true] +load --table Memos +[ +["content"], +["Start groonga!"], +["Start mroonga!"], +["Start rroonga!"] +] +[[0,0.0,0.0],3] +load --table Synonyms +[ +["_key", "words"], +["groonga storage engine", ["groonga storage engine", "mroonga"]] +] +[[0,0.0,0.0],1] +select --table Memos --query_expansion Synonyms.words --match_columns content --query '"groonga storage engine"' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 1 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "content", + "ShortText" + ] + ], + [ + 2, + "Start mroonga!" + ] + ] + ] +] Added: test/command/suite/select/query_expansion/vector/with_space.test (+25 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/query_expansion/vector/with_space.test 2012-10-09 11:53:53 +0900 (31bafb1) @@ -0,0 +1,25 @@ +table_create Memos TABLE_NO_KEY +column_create Memos content COLUMN_SCALAR ShortText + +table_create Lexicon TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram +column_create Lexicon diary_content COLUMN_INDEX|WITH_POSITION Memos content + +table_create Synonyms TABLE_PAT_KEY ShortText +column_create Synonyms words COLUMN_VECTOR ShortText + +load --table Memos +[ +["content"], +["Start groonga!"], +["Start mroonga!"], +["Start rroonga!"] +] + +load --table Synonyms +[ +["_key", "words"], +["groonga storage engine", ["groonga storage engine", "mroonga"]] +] + +select --table Memos --query_expansion Synonyms.words \ + --match_columns content --query '"groonga storage engine"' Modified: test/unit/core/test-command-select-query-expansion.c (+0 -22) =================================================================== --- test/unit/core/test-command-select-query-expansion.c 2012-10-09 11:49:54 +0900 (0f662ba) +++ test/unit/core/test-command-select-query-expansion.c 2012-10-09 11:53:53 +0900 (c808040) @@ -186,28 +186,6 @@ data_scalar_and_vector(void) } void -data_no_expand_word_with_space(void) -{ - data_scalar_and_vector(); -} - -void -test_no_expand_word_with_space(gconstpointer data) -{ - cut_assert_equal_string( - "[[[1]," - "[[\"_id\",\"UInt32\"]," - "[\"_key\",\"Time\"]," - "[\"content\",\"Text\"]]," - "[9,1316358000.0,\"Learning Ruby and groonga...\"]]]", - send_command( - cut_take_printf("select Diaries " - "--match_columns content --query '\"Ruby and groonga\"' " - "--query_expansion Synonyms.%s", - gcut_data_get_string(data, "column-name")))); -} - -void data_nonexistent_expansion_column(void) { data_scalar_and_vector(); -------------- next part -------------- HTML����������������������������...Download