Kouhei Sutou
null+****@clear*****
Tue Oct 9 11:19:17 JST 2012
Kouhei Sutou 2012-10-09 11:19:17 +0900 (Tue, 09 Oct 2012) New Revision: e6dcaff8bed3b27a92a1b06be9d359f74dac1f89 https://github.com/groonga/groonga/commit/e6dcaff8bed3b27a92a1b06be9d359f74dac1f89 Log: Move Cutter tests to grntest tests Tests for --query_expansion + is moved. Added files: test/command/suite/select/query_expansion/scalar/plus.expected test/command/suite/select/query_expansion/scalar/plus.test test/command/suite/select/query_expansion/vector/plus.expected test/command/suite/select/query_expansion/vector/plus.test Modified files: test/unit/core/test-command-select-query-expansion.c Added: test/command/suite/select/query_expansion/scalar/plus.expected (+60 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/query_expansion/scalar/plus.expected 2012-10-09 11:19:17 +0900 (80b4bcf) @@ -0,0 +1,60 @@ +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 Ruby!"], +["Learning Ruby and groonga..."], +["Learning Ruby AND groonga..."] +] +[[0,0.0,0.0],4] +load --table Synonyms +[ +["_key", "words"], +["+", "AND"] +] +[[0,0.0,0.0],1] +select --table Memos --query_expansion Synonyms.words --match_columns content --query 'Ruby + groonga' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 2 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "content", + "ShortText" + ] + ], + [ + 3, + "Learning Ruby and groonga..." + ], + [ + 4, + "Learning Ruby AND groonga..." + ] + ] + ] +] Added: test/command/suite/select/query_expansion/scalar/plus.test (+26 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/query_expansion/scalar/plus.test 2012-10-09 11:19:17 +0900 (d7a137d) @@ -0,0 +1,26 @@ +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 Ruby!"], +["Learning Ruby and groonga..."], +["Learning Ruby AND groonga..."] +] + +load --table Synonyms +[ +["_key", "words"], +["+", "AND"] +] + +select --table Memos --query_expansion Synonyms.words \ + --match_columns content --query 'Ruby + groonga' Added: test/command/suite/select/query_expansion/vector/plus.expected (+60 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/query_expansion/vector/plus.expected 2012-10-09 11:19:17 +0900 (456f15e) @@ -0,0 +1,60 @@ +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 Ruby!"], +["Learning Ruby and groonga..."], +["Learning Ruby AND groonga..."] +] +[[0,0.0,0.0],4] +load --table Synonyms +[ +["_key", "words"], +["+", ["AND"]] +] +[[0,0.0,0.0],1] +select --table Memos --query_expansion Synonyms.words --match_columns content --query 'Ruby + groonga' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 2 + ], + [ + [ + "_id", + "UInt32" + ], + [ + "content", + "ShortText" + ] + ], + [ + 3, + "Learning Ruby and groonga..." + ], + [ + 4, + "Learning Ruby AND groonga..." + ] + ] + ] +] Added: test/command/suite/select/query_expansion/vector/plus.test (+26 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/query_expansion/vector/plus.test 2012-10-09 11:19:17 +0900 (360be81) @@ -0,0 +1,26 @@ +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 Ruby!"], +["Learning Ruby and groonga..."], +["Learning Ruby AND groonga..."] +] + +load --table Synonyms +[ +["_key", "words"], +["+", ["AND"]] +] + +select --table Memos --query_expansion Synonyms.words \ + --match_columns content --query 'Ruby + groonga' 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:13:40 +0900 (e2a3330) +++ test/unit/core/test-command-select-query-expansion.c 2012-10-09 11:19:17 +0900 (406681a) @@ -186,28 +186,6 @@ data_scalar_and_vector(void) } void -data_not_expand_and(void) -{ - data_scalar_and_vector(); -} - -void -test_not_expand_and(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 --sortby _id " - "--match_columns content --query 'Ruby + groonga' " - "--query_expansion Synonyms.%s", - gcut_data_get_string(data, "column-name")))); -} - -void data_not_expand_but(void) { data_scalar_and_vector(); -------------- next part -------------- HTML����������������������������... Download