Kouhei Sutou
null+****@clear*****
Tue Mar 19 18:58:43 JST 2013
Kouhei Sutou 2013-03-19 18:58:43 +0900 (Tue, 19 Mar 2013) New Revision: e6c57cc79b486f2d30c9aa00fdb4435626080b7e https://github.com/groonga/groonga/commit/e6c57cc79b486f2d30c9aa00fdb4435626080b7e Message: select: rename --query_expansion to --query_expander for consistency Other parameter names such as --scorer and --default_tokenizer uses "-er" style but --query_expansion doesn't use it. So --query_expansion is renamed to --query_expander. --query_expansion is deprecated but it can be used. If both of --query_expansion and --query_expander are used, --query_expander is --used and --query_expansion is ignored. Test files are renamed to adapt this speicication change: test/command/suite/select/query_expansion/query_expander/ -> test/command/suite/select/query_expander/proc/ test/command/suite/select/query_expansion/* -> test/command/suite/select/query_expander/column/ test/command/suite/select/query_expander/* are added for backward compatibility check. Copied files: test/command/suite/select/query_expander/column/scalar/column_match_without_space.expected (from test/command/suite/select/query_expansion/scalar/column_match_without_space.expected) test/command/suite/select/query_expander/column/scalar/one_word.test (from test/command/suite/select/query_expansion/scalar/one_word.test) test/command/suite/select/query_expander/column/vector/column_match_without_space.expected (from test/command/suite/select/query_expansion/vector/column_match_without_space.expected) test/command/suite/select/query_expander/column/vector/one_word.test (from test/command/suite/select/query_expansion/vector/one_word.test) Modified files: lib/proc.c Renamed files: test/command/suite/select/query_expander/column/nonexistent_expansion_column.expected (from test/command/suite/select/query_expansion/nonexistent_expansion_column.expected) test/command/suite/select/query_expander/column/nonexistent_expansion_column.test (from test/command/suite/select/query_expansion/nonexistent_expansion_column.test) test/command/suite/select/query_expander/column/scalar/and.expected (from test/command/suite/select/query_expansion/scalar/and.expected) test/command/suite/select/query_expander/column/scalar/and.test (from test/command/suite/select/query_expansion/scalar/and.test) test/command/suite/select/query_expander/column/scalar/column_equal_without_update_flag.expected (from test/command/suite/select/query_expansion/scalar/column_equal_without_update_flag.expected) test/command/suite/select/query_expander/column/scalar/column_equal_without_update_flag.test (from test/command/suite/select/query_expansion/scalar/column_equal_without_update_flag.test) test/command/suite/select/query_expander/column/scalar/column_match_with_space.expected (from test/command/suite/select/query_expansion/scalar/column_match_with_space.expected) test/command/suite/select/query_expander/column/scalar/column_match_with_space.test (from test/command/suite/select/query_expansion/scalar/column_match_with_space.test) test/command/suite/select/query_expander/column/scalar/column_match_without_space.test (from test/command/suite/select/query_expansion/scalar/column_match_without_space.test) test/command/suite/select/query_expander/column/scalar/minus.expected (from test/command/suite/select/query_expansion/scalar/minus.expected) test/command/suite/select/query_expander/column/scalar/minus.test (from test/command/suite/select/query_expansion/scalar/minus.test) test/command/suite/select/query_expander/column/scalar/normalize.expected (from test/command/suite/select/query_expansion/scalar/normalize.expected) test/command/suite/select/query_expander/column/scalar/normalize.test (from test/command/suite/select/query_expansion/scalar/normalize.test) test/command/suite/select/query_expander/column/scalar/not_recursive.expected (from test/command/suite/select/query_expansion/scalar/not_recursive.expected) test/command/suite/select/query_expander/column/scalar/not_recursive.test (from test/command/suite/select/query_expansion/scalar/not_recursive.test) test/command/suite/select/query_expander/column/scalar/not_registered_synonym.expected (from test/command/suite/select/query_expansion/scalar/not_registered_synonym.expected) test/command/suite/select/query_expander/column/scalar/not_registered_synonym.test (from test/command/suite/select/query_expansion/scalar/not_registered_synonym.test) test/command/suite/select/query_expander/column/scalar/one_word.expected (from test/command/suite/select/query_expansion/scalar/column_match_without_space.expected) test/command/suite/select/query_expander/column/scalar/or.expected (from test/command/suite/select/query_expansion/scalar/or.expected) test/command/suite/select/query_expander/column/scalar/or.test (from test/command/suite/select/query_expansion/scalar/or.test) test/command/suite/select/query_expander/column/scalar/or_at_the_end.expected (from test/command/suite/select/query_expansion/scalar/or_at_the_end.expected) test/command/suite/select/query_expander/column/scalar/or_at_the_end.test (from test/command/suite/select/query_expansion/scalar/or_at_the_end.test) test/command/suite/select/query_expander/column/scalar/parenthesis.expected (from test/command/suite/select/query_expansion/scalar/parenthesis.expected) test/command/suite/select/query_expander/column/scalar/parenthesis.test (from test/command/suite/select/query_expansion/scalar/parenthesis.test) test/command/suite/select/query_expander/column/scalar/phrase.expected (from test/command/suite/select/query_expansion/scalar/phrase.expected) test/command/suite/select/query_expander/column/scalar/phrase.test (from test/command/suite/select/query_expansion/scalar/phrase.test) test/command/suite/select/query_expander/column/scalar/plus.expected (from test/command/suite/select/query_expansion/scalar/plus.expected) test/command/suite/select/query_expander/column/scalar/plus.test (from test/command/suite/select/query_expansion/scalar/plus.test) test/command/suite/select/query_expander/column/scalar/prefix.expected (from test/command/suite/select/query_expansion/scalar/prefix.expected) test/command/suite/select/query_expander/column/scalar/prefix.test (from test/command/suite/select/query_expansion/scalar/prefix.test) test/command/suite/select/query_expander/column/scalar/quoted_or.expected (from test/command/suite/select/query_expansion/scalar/quoted_or.expected) test/command/suite/select/query_expander/column/scalar/quoted_or.test (from test/command/suite/select/query_expansion/scalar/quoted_or.test) test/command/suite/select/query_expander/column/scalar/with_space.expected (from test/command/suite/select/query_expansion/scalar/with_space.expected) test/command/suite/select/query_expander/column/scalar/with_space.test (from test/command/suite/select/query_expansion/scalar/with_space.test) test/command/suite/select/query_expander/column/vector/and.expected (from test/command/suite/select/query_expansion/vector/and.expected) test/command/suite/select/query_expander/column/vector/and.test (from test/command/suite/select/query_expansion/vector/and.test) test/command/suite/select/query_expander/column/vector/column_equal_without_update_flag.expected (from test/command/suite/select/query_expansion/vector/column_equal_without_update_flag.expected) test/command/suite/select/query_expander/column/vector/column_equal_without_update_flag.test (from test/command/suite/select/query_expansion/vector/column_equal_without_update_flag.test) test/command/suite/select/query_expander/column/vector/column_match_with_space.expected (from test/command/suite/select/query_expansion/vector/column_match_with_space.expected) test/command/suite/select/query_expander/column/vector/column_match_with_space.test (from test/command/suite/select/query_expansion/vector/column_match_with_space.test) test/command/suite/select/query_expander/column/vector/column_match_without_space.test (from test/command/suite/select/query_expansion/vector/column_match_without_space.test) test/command/suite/select/query_expander/column/vector/minus.expected (from test/command/suite/select/query_expansion/vector/minus.expected) test/command/suite/select/query_expander/column/vector/minus.test (from test/command/suite/select/query_expansion/vector/minus.test) test/command/suite/select/query_expander/column/vector/normalize.expected (from test/command/suite/select/query_expansion/vector/normalize.expected) test/command/suite/select/query_expander/column/vector/normalize.test (from test/command/suite/select/query_expansion/vector/normalize.test) test/command/suite/select/query_expander/column/vector/not_recursive.expected (from test/command/suite/select/query_expansion/vector/not_recursive.expected) test/command/suite/select/query_expander/column/vector/not_recursive.test (from test/command/suite/select/query_expansion/vector/not_recursive.test) test/command/suite/select/query_expander/column/vector/not_registered_synonym.expected (from test/command/suite/select/query_expansion/vector/not_registered_synonym.expected) test/command/suite/select/query_expander/column/vector/not_registered_synonym.test (from test/command/suite/select/query_expansion/vector/not_registered_synonym.test) test/command/suite/select/query_expander/column/vector/one_word.expected (from test/command/suite/select/query_expansion/vector/one_word.expected) test/command/suite/select/query_expander/column/vector/or.expected (from test/command/suite/select/query_expansion/vector/or.expected) test/command/suite/select/query_expander/column/vector/or.test (from test/command/suite/select/query_expansion/vector/or.test) test/command/suite/select/query_expander/column/vector/or_at_the_end.expected (from test/command/suite/select/query_expansion/vector/or_at_the_end.expected) test/command/suite/select/query_expander/column/vector/or_at_the_end.test (from test/command/suite/select/query_expansion/vector/or_at_the_end.test) test/command/suite/select/query_expander/column/vector/parenthesis.expected (from test/command/suite/select/query_expansion/vector/parenthesis.expected) test/command/suite/select/query_expander/column/vector/parenthesis.test (from test/command/suite/select/query_expansion/vector/parenthesis.test) test/command/suite/select/query_expander/column/vector/phrase.expected (from test/command/suite/select/query_expansion/vector/phrase.expected) test/command/suite/select/query_expander/column/vector/phrase.test (from test/command/suite/select/query_expansion/vector/phrase.test) test/command/suite/select/query_expander/column/vector/plus.expected (from test/command/suite/select/query_expansion/vector/plus.expected) test/command/suite/select/query_expander/column/vector/plus.test (from test/command/suite/select/query_expansion/vector/plus.test) test/command/suite/select/query_expander/column/vector/prefix.expected (from test/command/suite/select/query_expansion/vector/prefix.expected) test/command/suite/select/query_expander/column/vector/prefix.test (from test/command/suite/select/query_expansion/vector/prefix.test) test/command/suite/select/query_expander/column/vector/quoted_or.expected (from test/command/suite/select/query_expansion/vector/quoted_or.expected) test/command/suite/select/query_expander/column/vector/quoted_or.test (from test/command/suite/select/query_expansion/vector/quoted_or.test) test/command/suite/select/query_expander/column/vector/with_space.expected (from test/command/suite/select/query_expansion/vector/with_space.expected) test/command/suite/select/query_expander/column/vector/with_space.test (from test/command/suite/select/query_expansion/vector/with_space.test) test/command/suite/select/query_expander/proc/tsv/expand.expected (from test/command/suite/select/query_expansion/query_expander/tsv/expand.expected) test/command/suite/select/query_expander/proc/tsv/expand.test (from test/command/suite/select/query_expansion/query_expander/tsv/expand.test) test/command/suite/select/query_expansion/with_expander.expected (from test/command/suite/select/query_expansion/vector/column_match_without_space.expected) test/command/suite/select/query_expansion/with_expander.test (from test/command/suite/select/query_expansion/vector/one_word.test) test/command/suite/select/query_expansion/without_expander.expected (from test/command/suite/select/query_expansion/scalar/one_word.expected) test/command/suite/select/query_expansion/without_expander.test (from test/command/suite/select/query_expansion/scalar/one_word.test) Modified: lib/proc.c (+24 -17) =================================================================== --- lib/proc.c 2013-03-19 10:50:57 +0900 (8eb3eab) +++ lib/proc.c 2013-03-19 18:58:43 +0900 (0617056) @@ -456,7 +456,7 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, int drilldown_offset, int drilldown_limit, const char *cache, unsigned int cache_len, const char *match_escalation_threshold, unsigned int match_escalation_threshold_len, - const char *query_expansion, unsigned int query_expansion_len, + const char *query_expander, unsigned int query_expander_len, const char *query_flags, unsigned int query_flags_len, grn_obj *condition_ptr, grn_obj *match_columns_ptr) { @@ -472,7 +472,7 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, filter_len + 1 + scorer_len + 1 + sortby_len + 1 + output_columns_len + 1 + drilldown_len + 1 + drilldown_sortby_len + 1 + drilldown_output_columns_len + 1 + match_escalation_threshold_len + 1 + - query_expansion_len + 1 + query_flags_len + 1 + + query_expander_len + 1 + query_flags_len + 1 + sizeof(grn_content_type) + sizeof(int) * 4; long long int threshold, original_threshold = 0; if (cache_key_size <= GRN_TABLE_MAX_KEY_SIZE) { @@ -500,8 +500,8 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, cp += drilldown_output_columns_len; *cp++ = '\0'; memcpy(cp, match_escalation_threshold, match_escalation_threshold_len); cp += match_escalation_threshold_len; *cp++ = '\0'; - memcpy(cp, query_expansion, query_expansion_len); - cp += query_expansion_len; *cp++ = '\0'; + memcpy(cp, query_expander, query_expander_len); + cp += query_expander_len; *cp++ = '\0'; memcpy(cp, query_flags, query_flags_len); cp += query_flags_len; *cp++ = '\0'; memcpy(cp, &output_type, sizeof(grn_content_type)); cp += sizeof(grn_content_type); @@ -547,8 +547,8 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, } if (query_len) { grn_expr_flags flags; - grn_obj query_expansion_buf; - GRN_TEXT_INIT(&query_expansion_buf, 0); + grn_obj query_expander_buf; + GRN_TEXT_INIT(&query_expander_buf, 0); flags = GRN_EXPR_SYNTAX_QUERY; if (query_flags_len) { flags |= grn_parse_query_flags(ctx, query_flags, query_flags_len); @@ -558,20 +558,20 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, goto exit; } } - if (query_expansion_len) { + if (query_expander_len) { if (expand_query(ctx, query, query_len, flags, - query_expansion, query_expansion_len, - &query_expansion_buf) == GRN_SUCCESS) { - query = GRN_TEXT_VALUE(&query_expansion_buf); - query_len = GRN_TEXT_LEN(&query_expansion_buf); + query_expander, query_expander_len, + &query_expander_buf) == GRN_SUCCESS) { + query = GRN_TEXT_VALUE(&query_expander_buf); + query_len = GRN_TEXT_LEN(&query_expander_buf); } else { - GRN_OBJ_FIN(ctx, &query_expansion_buf); + GRN_OBJ_FIN(ctx, &query_expander_buf); goto exit; } } grn_expr_parse(ctx, cond, query, query_len, match_columns_, GRN_OP_MATCH, GRN_OP_AND, flags); - GRN_OBJ_FIN(ctx, &query_expansion_buf); + GRN_OBJ_FIN(ctx, &query_expander_buf); if (!ctx->rc && filter_len) { grn_expr_parse(ctx, cond, filter, filter_len, match_columns_, GRN_OP_MATCH, GRN_OP_AND, @@ -794,6 +794,11 @@ proc_select(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) ? grn_atoi(GRN_TEXT_VALUE(VAR(13)), GRN_BULK_CURR(VAR(13)), NULL) : DEFAULT_DRILLDOWN_LIMIT; grn_obj *condition_ptr, *match_columns_ptr; + grn_obj *query_expansion = VAR(16); + grn_obj *query_expander = VAR(18); + if (GRN_TEXT_LEN(query_expander) == 0 && GRN_TEXT_LEN(query_expansion) > 0) { + query_expander = query_expansion; + } if (!output_columns_len) { output_columns = DEFAULT_OUTPUT_COLUMNS; output_columns_len = strlen(DEFAULT_OUTPUT_COLUMNS); @@ -820,7 +825,7 @@ proc_select(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) drilldown_offset, drilldown_limit, GRN_TEXT_VALUE(VAR(14)), GRN_TEXT_LEN(VAR(14)), GRN_TEXT_VALUE(VAR(15)), GRN_TEXT_LEN(VAR(15)), - GRN_TEXT_VALUE(VAR(16)), GRN_TEXT_LEN(VAR(16)), + GRN_TEXT_VALUE(query_expander), GRN_TEXT_LEN(query_expander), GRN_TEXT_VALUE(VAR(17)), GRN_TEXT_LEN(VAR(17)), condition_ptr, match_columns_ptr)) { } @@ -3834,7 +3839,7 @@ selector_sub_filter(grn_ctx *ctx, grn_obj *table, grn_obj *index, void grn_db_init_builtin_query(grn_ctx *ctx) { - grn_expr_var vars[19]; + grn_expr_var vars[20]; DEF_VAR(vars[0], "name"); DEF_VAR(vars[1], "table"); @@ -3853,10 +3858,12 @@ grn_db_init_builtin_query(grn_ctx *ctx) DEF_VAR(vars[14], "drilldown_limit"); DEF_VAR(vars[15], "cache"); DEF_VAR(vars[16], "match_escalation_threshold"); + /* Deprecated. Use query_expander instead. */ DEF_VAR(vars[17], "query_expansion"); DEF_VAR(vars[18], "query_flags"); - DEF_COMMAND("define_selector", proc_define_selector, 19, vars); - DEF_COMMAND("select", proc_select, 18, vars + 1); + DEF_VAR(vars[19], "query_expander"); + DEF_COMMAND("define_selector", proc_define_selector, 20, vars); + DEF_COMMAND("select", proc_select, 19, vars + 1); DEF_VAR(vars[0], "values"); DEF_VAR(vars[1], "table"); Renamed: test/command/suite/select/query_expander/column/nonexistent_expansion_column.expected (+1 -1) 82% =================================================================== --- test/command/suite/select/query_expansion/nonexistent_expansion_column.expected 2013-03-19 10:50:57 +0900 (eb0122f) +++ test/command/suite/select/query_expander/column/nonexistent_expansion_column.expected 2013-03-19 18:58:43 +0900 (c4503ac) @@ -6,7 +6,7 @@ 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] -select --table Memos --query_expansion Nonexistent.nonexistent --match_columns content --query rroonga +select --table Memos --query_expander Nonexistent.nonexistent --match_columns content --query rroonga [ [ [ Renamed: test/command/suite/select/query_expander/column/nonexistent_expansion_column.test (+1 -1) 81% =================================================================== --- test/command/suite/select/query_expansion/nonexistent_expansion_column.test 2013-03-19 10:50:57 +0900 (2fdc2e6) +++ test/command/suite/select/query_expander/column/nonexistent_expansion_column.test 2013-03-19 18:58:43 +0900 (5aa44e6) @@ -4,5 +4,5 @@ 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 -select --table Memos --query_expansion Nonexistent.nonexistent \ +select --table Memos --query_expander Nonexistent.nonexistent \ --match_columns content --query rroonga Renamed: test/command/suite/select/query_expander/column/scalar/and.expected (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/and.expected 2013-03-19 10:50:57 +0900 (9ea0a77) +++ test/command/suite/select/query_expander/column/scalar/and.expected 2013-03-19 18:58:43 +0900 (50427f6) @@ -26,7 +26,7 @@ load --table Synonyms ["rroonga", "(rroonga OR (Ruby groonga))"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query rroonga +select --table Memos --query_expander Synonyms.words --match_columns content --query rroonga [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/and.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/and.test 2013-03-19 10:50:57 +0900 (1ed5a34) +++ test/command/suite/select/query_expander/column/scalar/and.test 2013-03-19 18:58:43 +0900 (f671614) @@ -23,5 +23,5 @@ load --table Synonyms ["rroonga", "(rroonga OR (Ruby groonga))"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query rroonga Renamed: test/command/suite/select/query_expander/column/scalar/column_equal_without_update_flag.expected (+1 -1) 92% =================================================================== --- test/command/suite/select/query_expansion/scalar/column_equal_without_update_flag.expected 2013-03-19 10:50:57 +0900 (205707c) +++ test/command/suite/select/query_expander/column/scalar/column_equal_without_update_flag.expected 2013-03-19 18:58:43 +0900 (d2f1510) @@ -24,7 +24,7 @@ load --table Synonyms ["=mroonga", "\"=groonga storage engine\""] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --query 'content:=mroonga' +select --table Memos --query_expander Synonyms.words --query 'content:=mroonga' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/column_equal_without_update_flag.test (+1 -1) 86% =================================================================== --- test/command/suite/select/query_expansion/scalar/column_equal_without_update_flag.test 2013-03-19 10:50:57 +0900 (77958a8) +++ test/command/suite/select/query_expander/column/scalar/column_equal_without_update_flag.test 2013-03-19 18:58:43 +0900 (9a68ae6) @@ -21,4 +21,4 @@ load --table Synonyms ["=mroonga", "\"=groonga storage engine\""] ] -select --table Memos --query_expansion Synonyms.words --query 'content:=mroonga' +select --table Memos --query_expander Synonyms.words --query 'content:=mroonga' Renamed: test/command/suite/select/query_expander/column/scalar/column_match_with_space.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/scalar/column_match_with_space.expected 2013-03-19 10:50:57 +0900 (2c3ed81) +++ test/command/suite/select/query_expander/column/scalar/column_match_with_space.expected 2013-03-19 18:58:43 +0900 (7c0e9f1) @@ -24,7 +24,7 @@ load --table Synonyms ["groonga storage engine", "(\"groonga storage engine\" OR mroonga)"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --query 'content:@"groonga storage engine"' +select --table Memos --query_expander Synonyms.words --query 'content:@"groonga storage engine"' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/column_match_with_space.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/column_match_with_space.test 2013-03-19 10:50:57 +0900 (8244abc) +++ test/command/suite/select/query_expander/column/scalar/column_match_with_space.test 2013-03-19 18:58:43 +0900 (33c2501) @@ -21,5 +21,5 @@ load --table Synonyms ["groonga storage engine", "(\"groonga storage engine\" OR mroonga)"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --query 'content:@"groonga storage engine"' Copied: test/command/suite/select/query_expander/column/scalar/column_match_without_space.expected (+1 -1) 92% =================================================================== --- test/command/suite/select/query_expansion/scalar/column_match_without_space.expected 2013-03-19 10:50:57 +0900 (61841d4) +++ test/command/suite/select/query_expander/column/scalar/column_match_without_space.expected 2013-03-19 18:58:43 +0900 (01c3c45) @@ -25,7 +25,7 @@ load --table Synonyms ["groonga", "(groonga OR rroonga OR mroonga)"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --query 'content:@groonga' +select --table Memos --query_expander Synonyms.words --query 'content:@groonga' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/column_match_without_space.test (+1 -1) 87% =================================================================== --- test/command/suite/select/query_expansion/scalar/column_match_without_space.test 2013-03-19 10:50:57 +0900 (fcbd0f3) +++ test/command/suite/select/query_expander/column/scalar/column_match_without_space.test 2013-03-19 18:58:43 +0900 (63694eb) @@ -22,4 +22,4 @@ load --table Synonyms ["groonga", "(groonga OR rroonga OR mroonga)"] ] -select --table Memos --query_expansion Synonyms.words --query 'content:@groonga' +select --table Memos --query_expander Synonyms.words --query 'content:@groonga' Renamed: test/command/suite/select/query_expander/column/scalar/minus.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/scalar/minus.expected 2013-03-19 10:50:57 +0900 (291fdd4) +++ test/command/suite/select/query_expander/column/scalar/minus.expected 2013-03-19 18:58:43 +0900 (bc97db4) @@ -25,7 +25,7 @@ load --table Synonyms ["-", "BUT"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'Ruby - groonga' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'Ruby - groonga' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/minus.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/minus.test 2013-03-19 10:50:57 +0900 (8b780df) +++ test/command/suite/select/query_expander/column/scalar/minus.test 2013-03-19 18:58:43 +0900 (3645669) @@ -22,5 +22,5 @@ load --table Synonyms ["-", "BUT"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'Ruby - groonga' Renamed: test/command/suite/select/query_expander/column/scalar/normalize.expected (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/normalize.expected 2013-03-19 10:50:57 +0900 (a243a79) +++ test/command/suite/select/query_expander/column/scalar/normalize.expected 2013-03-19 18:58:43 +0900 (3bdb572) @@ -24,7 +24,7 @@ load --table Synonyms ["Ruby", "(Ruby OR rroonga)"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query ruby +select --table Memos --query_expander Synonyms.words --match_columns content --query ruby [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/normalize.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/normalize.test 2013-03-19 10:50:57 +0900 (da2b4ed) +++ test/command/suite/select/query_expander/column/scalar/normalize.test 2013-03-19 18:58:43 +0900 (3829dce) @@ -21,5 +21,5 @@ load --table Synonyms ["Ruby", "(Ruby OR rroonga)"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query ruby Renamed: test/command/suite/select/query_expander/column/scalar/not_recursive.expected (+1 -1) 92% =================================================================== --- test/command/suite/select/query_expansion/scalar/not_recursive.expected 2013-03-19 10:50:57 +0900 (8953cb6) +++ test/command/suite/select/query_expander/column/scalar/not_recursive.expected 2013-03-19 18:58:43 +0900 (7e85289) @@ -26,7 +26,7 @@ load --table Synonyms ["groonga", "(groonga OR mroonga)"] ] [[0,0.0,0.0],2] -select --table Memos --query_expansion Synonyms.words --match_columns content --query rroonga +select --table Memos --query_expander Synonyms.words --match_columns content --query rroonga [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/not_recursive.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/not_recursive.test 2013-03-19 10:50:57 +0900 (a85fa38) +++ test/command/suite/select/query_expander/column/scalar/not_recursive.test 2013-03-19 18:58:43 +0900 (78b601b) @@ -23,5 +23,5 @@ load --table Synonyms ["groonga", "(groonga OR mroonga)"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query rroonga Renamed: test/command/suite/select/query_expander/column/scalar/not_registered_synonym.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/scalar/not_registered_synonym.expected 2013-03-19 10:50:57 +0900 (80363c8) +++ test/command/suite/select/query_expander/column/scalar/not_registered_synonym.expected 2013-03-19 18:58:43 +0900 (fff1e4e) @@ -25,7 +25,7 @@ load --table Synonyms ["rroonga", "Ruby OR groonga"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'Ruby' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'Ruby' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/not_registered_synonym.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/not_registered_synonym.test 2013-03-19 10:50:57 +0900 (03f57ba) +++ test/command/suite/select/query_expander/column/scalar/not_registered_synonym.test 2013-03-19 18:58:43 +0900 (a0fc623) @@ -22,5 +22,5 @@ load --table Synonyms ["rroonga", "Ruby OR groonga"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'Ruby' Renamed: test/command/suite/select/query_expander/column/scalar/one_word.expected (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/column_match_without_space.expected 2013-03-19 10:50:57 +0900 (61841d4) +++ test/command/suite/select/query_expander/column/scalar/one_word.expected 2013-03-19 18:58:43 +0900 (47c2575) @@ -25,7 +25,7 @@ load --table Synonyms ["groonga", "(groonga OR rroonga OR mroonga)"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --query 'content:@groonga' +select --table Memos --query_expander Synonyms.words --match_columns content --query groonga [ [ 0, Copied: test/command/suite/select/query_expander/column/scalar/one_word.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/one_word.test 2013-03-19 10:50:57 +0900 (f532cae) +++ test/command/suite/select/query_expander/column/scalar/one_word.test 2013-03-19 18:58:43 +0900 (62c0a09) @@ -22,5 +22,5 @@ load --table Synonyms ["groonga", "(groonga OR rroonga OR mroonga)"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query groonga Renamed: test/command/suite/select/query_expander/column/scalar/or.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/scalar/or.expected 2013-03-19 10:50:57 +0900 (3b8e7a6) +++ test/command/suite/select/query_expander/column/scalar/or.expected 2013-03-19 18:58:43 +0900 (c47afab) @@ -25,7 +25,7 @@ load --table Synonyms ["OR", "or"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'groonga OR mroonga' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'groonga OR mroonga' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/or.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/or.test 2013-03-19 10:50:57 +0900 (2ba7097) +++ test/command/suite/select/query_expander/column/scalar/or.test 2013-03-19 18:58:43 +0900 (f608dd9) @@ -22,5 +22,5 @@ load --table Synonyms ["OR", "or"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'groonga OR mroonga' Renamed: test/command/suite/select/query_expander/column/scalar/or_at_the_end.expected (+1 -1) 87% =================================================================== --- test/command/suite/select/query_expansion/scalar/or_at_the_end.expected 2013-03-19 10:50:57 +0900 (2dd84f4) +++ test/command/suite/select/query_expander/column/scalar/or_at_the_end.expected 2013-03-19 18:58:43 +0900 (19782da) @@ -25,5 +25,5 @@ load --table Synonyms ["OR", "or"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'groonga OR' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'groonga OR' [[0,0.0,0.0],[[[0],[["_id","UInt32"],["content","ShortText"]]]]] Renamed: test/command/suite/select/query_expander/column/scalar/or_at_the_end.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/or_at_the_end.test 2013-03-19 10:50:57 +0900 (2d37a2a) +++ test/command/suite/select/query_expander/column/scalar/or_at_the_end.test 2013-03-19 18:58:43 +0900 (4ca15eb) @@ -22,5 +22,5 @@ load --table Synonyms ["OR", "or"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'groonga OR' Renamed: test/command/suite/select/query_expander/column/scalar/parenthesis.expected (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/parenthesis.expected 2013-03-19 10:50:57 +0900 (830d079) +++ test/command/suite/select/query_expander/column/scalar/parenthesis.expected 2013-03-19 18:58:43 +0900 (99de532) @@ -25,7 +25,7 @@ load --table Synonyms [")", "close"] ] [[0,0.0,0.0],2] -select --table Memos --query_expansion Synonyms.words --match_columns content --query '(groonga)' +select --table Memos --query_expander Synonyms.words --match_columns content --query '(groonga)' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/parenthesis.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/parenthesis.test 2013-03-19 10:50:57 +0900 (e626a39) +++ test/command/suite/select/query_expander/column/scalar/parenthesis.test 2013-03-19 18:58:43 +0900 (12ecf9c) @@ -22,5 +22,5 @@ load --table Synonyms [")", "close"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query '(groonga)' Renamed: test/command/suite/select/query_expander/column/scalar/phrase.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/scalar/phrase.expected 2013-03-19 10:50:57 +0900 (685b951) +++ test/command/suite/select/query_expander/column/scalar/phrase.expected 2013-03-19 18:58:43 +0900 (4ff98f1) @@ -25,7 +25,7 @@ load --table Synonyms ["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"' +select --table Memos --query_expander Synonyms.words --match_columns content --query '"groonga storage engine"' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/phrase.test (+1 -1) 92% =================================================================== --- test/command/suite/select/query_expansion/scalar/phrase.test 2013-03-19 10:50:57 +0900 (5616cf9) +++ test/command/suite/select/query_expander/column/scalar/phrase.test 2013-03-19 18:58:43 +0900 (55f5445) @@ -22,5 +22,5 @@ load --table Synonyms ["groonga storage engine", "(\"groonga storage engine\" OR mroonga)"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query '"groonga storage engine"' Renamed: test/command/suite/select/query_expander/column/scalar/plus.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/scalar/plus.expected 2013-03-19 10:50:57 +0900 (80b4bcf) +++ test/command/suite/select/query_expander/column/scalar/plus.expected 2013-03-19 18:58:43 +0900 (4b7bb00) @@ -25,7 +25,7 @@ load --table Synonyms ["+", "AND"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'Ruby + groonga' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'Ruby + groonga' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/plus.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/plus.test 2013-03-19 10:50:57 +0900 (d7a137d) +++ test/command/suite/select/query_expander/column/scalar/plus.test 2013-03-19 18:58:43 +0900 (ffc2c35) @@ -22,5 +22,5 @@ load --table Synonyms ["+", "AND"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'Ruby + groonga' Renamed: test/command/suite/select/query_expander/column/scalar/prefix.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/scalar/prefix.expected 2013-03-19 10:50:57 +0900 (dbddf87) +++ test/command/suite/select/query_expander/column/scalar/prefix.expected 2013-03-19 18:58:43 +0900 (103f236) @@ -24,7 +24,7 @@ load --table Synonyms ["mroon", "groon"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'mroon*' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'mroon*' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/prefix.test (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/scalar/prefix.test 2013-03-19 10:50:57 +0900 (9c180b5) +++ test/command/suite/select/query_expander/column/scalar/prefix.test 2013-03-19 18:58:43 +0900 (b471b80) @@ -22,5 +22,5 @@ load --table Synonyms ["mroon", "groon"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'mroon*' Renamed: test/command/suite/select/query_expander/column/scalar/quoted_or.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/scalar/quoted_or.expected 2013-03-19 10:50:57 +0900 (c4916c1) +++ test/command/suite/select/query_expander/column/scalar/quoted_or.expected 2013-03-19 18:58:43 +0900 (7f995ff) @@ -24,7 +24,7 @@ load --table Synonyms ["OR", "or"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query '"OR"' +select --table Memos --query_expander Synonyms.words --match_columns content --query '"OR"' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/quoted_or.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/quoted_or.test 2013-03-19 10:50:57 +0900 (73e8702) +++ test/command/suite/select/query_expander/column/scalar/quoted_or.test 2013-03-19 18:58:43 +0900 (29e1baa) @@ -21,5 +21,5 @@ load --table Synonyms ["OR", "or"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query '"OR"' Renamed: test/command/suite/select/query_expander/column/scalar/with_space.expected (+1 -1) 89% =================================================================== --- test/command/suite/select/query_expansion/scalar/with_space.expected 2013-03-19 10:50:57 +0900 (b2053d2) +++ test/command/suite/select/query_expander/column/scalar/with_space.expected 2013-03-19 18:58:43 +0900 (1f7274a) @@ -24,7 +24,7 @@ load --table Synonyms ["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"' +select --table Memos --query_expander Synonyms.words --match_columns content --query '"groonga storage engine"' [ [ 0, Renamed: test/command/suite/select/query_expander/column/scalar/with_space.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/scalar/with_space.test 2013-03-19 10:50:57 +0900 (96608bb) +++ test/command/suite/select/query_expander/column/scalar/with_space.test 2013-03-19 18:58:43 +0900 (2438874) @@ -21,5 +21,5 @@ load --table Synonyms ["groonga storage engine", "(\"groonga storage engine\" OR mroonga)"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query '"groonga storage engine"' Renamed: test/command/suite/select/query_expander/column/vector/and.expected (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/and.expected 2013-03-19 10:50:57 +0900 (22bec6e) +++ test/command/suite/select/query_expander/column/vector/and.expected 2013-03-19 18:58:43 +0900 (1ef56b1) @@ -26,7 +26,7 @@ load --table Synonyms ["rroonga", ["rroonga", "Ruby groonga"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query rroonga +select --table Memos --query_expander Synonyms.words --match_columns content --query rroonga [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/and.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/and.test 2013-03-19 10:50:57 +0900 (df1e6b2) +++ test/command/suite/select/query_expander/column/vector/and.test 2013-03-19 18:58:43 +0900 (ffce2bd) @@ -23,5 +23,5 @@ load --table Synonyms ["rroonga", ["rroonga", "Ruby groonga"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query rroonga Renamed: test/command/suite/select/query_expander/column/vector/column_equal_without_update_flag.expected (+1 -1) 92% =================================================================== --- test/command/suite/select/query_expansion/vector/column_equal_without_update_flag.expected 2013-03-19 10:50:57 +0900 (646fe6c) +++ test/command/suite/select/query_expander/column/vector/column_equal_without_update_flag.expected 2013-03-19 18:58:43 +0900 (0b8b3dc) @@ -24,7 +24,7 @@ load --table Synonyms ["=mroonga", ["\"=groonga storage engine\""]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --query 'content:=mroonga' +select --table Memos --query_expander Synonyms.words --query 'content:=mroonga' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/column_equal_without_update_flag.test (+1 -1) 86% =================================================================== --- test/command/suite/select/query_expansion/vector/column_equal_without_update_flag.test 2013-03-19 10:50:57 +0900 (f30e5ee) +++ test/command/suite/select/query_expander/column/vector/column_equal_without_update_flag.test 2013-03-19 18:58:43 +0900 (9652ed6) @@ -21,4 +21,4 @@ load --table Synonyms ["=mroonga", ["\"=groonga storage engine\""]] ] -select --table Memos --query_expansion Synonyms.words --query 'content:=mroonga' +select --table Memos --query_expander Synonyms.words --query 'content:=mroonga' Renamed: test/command/suite/select/query_expander/column/vector/column_match_with_space.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/vector/column_match_with_space.expected 2013-03-19 10:50:57 +0900 (e3bdedb) +++ test/command/suite/select/query_expander/column/vector/column_match_with_space.expected 2013-03-19 18:58:43 +0900 (4928ae8) @@ -24,7 +24,7 @@ load --table Synonyms ["groonga storage engine", ["groonga storage engine", "mroonga"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --query 'content:@"groonga storage engine"' +select --table Memos --query_expander Synonyms.words --query 'content:@"groonga storage engine"' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/column_match_with_space.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/column_match_with_space.test 2013-03-19 10:50:57 +0900 (8fb3e87) +++ test/command/suite/select/query_expander/column/vector/column_match_with_space.test 2013-03-19 18:58:43 +0900 (dbc4ea7) @@ -21,5 +21,5 @@ load --table Synonyms ["groonga storage engine", ["groonga storage engine", "mroonga"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --query 'content:@"groonga storage engine"' Copied: test/command/suite/select/query_expander/column/vector/column_match_without_space.expected (+1 -1) 92% =================================================================== --- test/command/suite/select/query_expansion/vector/column_match_without_space.expected 2013-03-19 10:50:57 +0900 (684f766) +++ test/command/suite/select/query_expander/column/vector/column_match_without_space.expected 2013-03-19 18:58:43 +0900 (136256a) @@ -25,7 +25,7 @@ load --table Synonyms ["groonga", ["groonga", "rroonga", "mroonga"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --query 'content:@groonga' +select --table Memos --query_expander Synonyms.words --query 'content:@groonga' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/column_match_without_space.test (+1 -1) 87% =================================================================== --- test/command/suite/select/query_expansion/vector/column_match_without_space.test 2013-03-19 10:50:57 +0900 (1ea3d49) +++ test/command/suite/select/query_expander/column/vector/column_match_without_space.test 2013-03-19 18:58:43 +0900 (0871b48) @@ -22,4 +22,4 @@ load --table Synonyms ["groonga", ["groonga", "rroonga", "mroonga"]] ] -select --table Memos --query_expansion Synonyms.words --query 'content:@groonga' +select --table Memos --query_expander Synonyms.words --query 'content:@groonga' Renamed: test/command/suite/select/query_expander/column/vector/minus.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/vector/minus.expected 2013-03-19 10:50:57 +0900 (051e4cc) +++ test/command/suite/select/query_expander/column/vector/minus.expected 2013-03-19 18:58:43 +0900 (0a2207b) @@ -25,7 +25,7 @@ load --table Synonyms ["-", ["BUT"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'Ruby - groonga' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'Ruby - groonga' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/minus.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/minus.test 2013-03-19 10:50:57 +0900 (9350e9f) +++ test/command/suite/select/query_expander/column/vector/minus.test 2013-03-19 18:58:43 +0900 (1a8d6b5) @@ -22,5 +22,5 @@ load --table Synonyms ["-", ["BUT"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'Ruby - groonga' Renamed: test/command/suite/select/query_expander/column/vector/normalize.expected (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/normalize.expected 2013-03-19 10:50:57 +0900 (44de57e) +++ test/command/suite/select/query_expander/column/vector/normalize.expected 2013-03-19 18:58:43 +0900 (a6043b1) @@ -24,7 +24,7 @@ load --table Synonyms ["Ruby", ["Ruby", "rroonga"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query ruby +select --table Memos --query_expander Synonyms.words --match_columns content --query ruby [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/normalize.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/normalize.test 2013-03-19 10:50:57 +0900 (d4a10f0) +++ test/command/suite/select/query_expander/column/vector/normalize.test 2013-03-19 18:58:43 +0900 (db5b5dd) @@ -21,5 +21,5 @@ load --table Synonyms ["Ruby", ["Ruby", "rroonga"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query ruby Renamed: test/command/suite/select/query_expander/column/vector/not_recursive.expected (+1 -1) 92% =================================================================== --- test/command/suite/select/query_expansion/vector/not_recursive.expected 2013-03-19 10:50:57 +0900 (aa12d43) +++ test/command/suite/select/query_expander/column/vector/not_recursive.expected 2013-03-19 18:58:43 +0900 (da69a1d) @@ -26,7 +26,7 @@ load --table Synonyms ["groonga", ["groonga", "mroonga"]] ] [[0,0.0,0.0],2] -select --table Memos --query_expansion Synonyms.words --match_columns content --query rroonga +select --table Memos --query_expander Synonyms.words --match_columns content --query rroonga [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/not_recursive.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/not_recursive.test 2013-03-19 10:50:57 +0900 (cac9185) +++ test/command/suite/select/query_expander/column/vector/not_recursive.test 2013-03-19 18:58:43 +0900 (272298f) @@ -23,5 +23,5 @@ load --table Synonyms ["groonga", ["groonga", "mroonga"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query rroonga Renamed: test/command/suite/select/query_expander/column/vector/not_registered_synonym.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/vector/not_registered_synonym.expected 2013-03-19 10:50:57 +0900 (8c22b7b) +++ test/command/suite/select/query_expander/column/vector/not_registered_synonym.expected 2013-03-19 18:58:43 +0900 (7d86f35) @@ -25,7 +25,7 @@ load --table Synonyms ["rroonga", ["Ruby", "groonga"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'Ruby' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'Ruby' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/not_registered_synonym.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/not_registered_synonym.test 2013-03-19 10:50:57 +0900 (b96fc2e) +++ test/command/suite/select/query_expander/column/vector/not_registered_synonym.test 2013-03-19 18:58:43 +0900 (f49ad0c) @@ -22,5 +22,5 @@ load --table Synonyms ["rroonga", ["Ruby", "groonga"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'Ruby' Renamed: test/command/suite/select/query_expander/column/vector/one_word.expected (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/one_word.expected 2013-03-19 10:50:57 +0900 (43cd368) +++ test/command/suite/select/query_expander/column/vector/one_word.expected 2013-03-19 18:58:43 +0900 (7b45273) @@ -25,7 +25,7 @@ load --table Synonyms ["groonga", ["groonga", "rroonga", "mroonga"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query groonga +select --table Memos --query_expander Synonyms.words --match_columns content --query groonga [ [ 0, Copied: test/command/suite/select/query_expander/column/vector/one_word.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/one_word.test 2013-03-19 10:50:57 +0900 (2d0b79d) +++ test/command/suite/select/query_expander/column/vector/one_word.test 2013-03-19 18:58:43 +0900 (13a04ea) @@ -22,5 +22,5 @@ load --table Synonyms ["groonga", ["groonga", "rroonga", "mroonga"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query groonga Renamed: test/command/suite/select/query_expander/column/vector/or.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/vector/or.expected 2013-03-19 10:50:57 +0900 (060e645) +++ test/command/suite/select/query_expander/column/vector/or.expected 2013-03-19 18:58:43 +0900 (bfd61e1) @@ -25,7 +25,7 @@ load --table Synonyms ["OR", ["or"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'groonga OR mroonga' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'groonga OR mroonga' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/or.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/or.test 2013-03-19 10:50:57 +0900 (dd47194) +++ test/command/suite/select/query_expander/column/vector/or.test 2013-03-19 18:58:43 +0900 (b8ac58b) @@ -22,5 +22,5 @@ load --table Synonyms ["OR", ["or"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'groonga OR mroonga' Renamed: test/command/suite/select/query_expander/column/vector/or_at_the_end.expected (+1 -1) 87% =================================================================== --- test/command/suite/select/query_expansion/vector/or_at_the_end.expected 2013-03-19 10:50:57 +0900 (23be358) +++ test/command/suite/select/query_expander/column/vector/or_at_the_end.expected 2013-03-19 18:58:43 +0900 (e6f08d9) @@ -25,5 +25,5 @@ load --table Synonyms ["OR", ["or"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'groonga OR' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'groonga OR' [[0,0.0,0.0],[[[0],[["_id","UInt32"],["content","ShortText"]]]]] Renamed: test/command/suite/select/query_expander/column/vector/or_at_the_end.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/or_at_the_end.test 2013-03-19 10:50:57 +0900 (bd153c0) +++ test/command/suite/select/query_expander/column/vector/or_at_the_end.test 2013-03-19 18:58:43 +0900 (efaf9c8) @@ -22,5 +22,5 @@ load --table Synonyms ["OR", ["or"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'groonga OR' Renamed: test/command/suite/select/query_expander/column/vector/parenthesis.expected (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/parenthesis.expected 2013-03-19 10:50:57 +0900 (bed8f68) +++ test/command/suite/select/query_expander/column/vector/parenthesis.expected 2013-03-19 18:58:43 +0900 (1f63485) @@ -25,7 +25,7 @@ load --table Synonyms [")", ["close"]] ] [[0,0.0,0.0],2] -select --table Memos --query_expansion Synonyms.words --match_columns content --query '(groonga)' +select --table Memos --query_expander Synonyms.words --match_columns content --query '(groonga)' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/parenthesis.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/parenthesis.test 2013-03-19 10:50:57 +0900 (71dcc2e) +++ test/command/suite/select/query_expander/column/vector/parenthesis.test 2013-03-19 18:58:43 +0900 (19f9b36) @@ -22,5 +22,5 @@ load --table Synonyms [")", ["close"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query '(groonga)' Renamed: test/command/suite/select/query_expander/column/vector/phrase.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/vector/phrase.expected 2013-03-19 10:50:57 +0900 (e0f03f8) +++ test/command/suite/select/query_expander/column/vector/phrase.expected 2013-03-19 18:58:43 +0900 (4c3e8c0) @@ -25,7 +25,7 @@ load --table Synonyms ["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"' +select --table Memos --query_expander Synonyms.words --match_columns content --query '"groonga storage engine"' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/phrase.test (+1 -1) 92% =================================================================== --- test/command/suite/select/query_expansion/vector/phrase.test 2013-03-19 10:50:57 +0900 (01d6e98) +++ test/command/suite/select/query_expander/column/vector/phrase.test 2013-03-19 18:58:43 +0900 (1e693b8) @@ -22,5 +22,5 @@ load --table Synonyms ["groonga storage engine", ["groonga storage engine", "mroonga"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query '"groonga storage engine"' Renamed: test/command/suite/select/query_expander/column/vector/plus.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/vector/plus.expected 2013-03-19 10:50:57 +0900 (456f15e) +++ test/command/suite/select/query_expander/column/vector/plus.expected 2013-03-19 18:58:43 +0900 (85cba0f) @@ -25,7 +25,7 @@ load --table Synonyms ["+", ["AND"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'Ruby + groonga' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'Ruby + groonga' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/plus.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/plus.test 2013-03-19 10:50:57 +0900 (360be81) +++ test/command/suite/select/query_expander/column/vector/plus.test 2013-03-19 18:58:43 +0900 (96fbdee) @@ -22,5 +22,5 @@ load --table Synonyms ["+", ["AND"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'Ruby + groonga' Renamed: test/command/suite/select/query_expander/column/vector/prefix.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/vector/prefix.expected 2013-03-19 10:50:57 +0900 (2d924ec) +++ test/command/suite/select/query_expander/column/vector/prefix.expected 2013-03-19 18:58:43 +0900 (09f1c62) @@ -24,7 +24,7 @@ load --table Synonyms ["mroon", ["groon"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query 'mroon*' +select --table Memos --query_expander Synonyms.words --match_columns content --query 'mroon*' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/prefix.test (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/vector/prefix.test 2013-03-19 10:50:57 +0900 (3e7e626) +++ test/command/suite/select/query_expander/column/vector/prefix.test 2013-03-19 18:58:43 +0900 (9965731) @@ -22,5 +22,5 @@ load --table Synonyms ["mroon", ["groon"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query 'mroon*' Renamed: test/command/suite/select/query_expander/column/vector/quoted_or.expected (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/vector/quoted_or.expected 2013-03-19 10:50:57 +0900 (ff08f5a) +++ test/command/suite/select/query_expander/column/vector/quoted_or.expected 2013-03-19 18:58:43 +0900 (bd6ba47) @@ -24,7 +24,7 @@ load --table Synonyms ["OR", ["or"]] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --match_columns content --query '"OR"' +select --table Memos --query_expander Synonyms.words --match_columns content --query '"OR"' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/quoted_or.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/quoted_or.test 2013-03-19 10:50:57 +0900 (8e4b727) +++ test/command/suite/select/query_expander/column/vector/quoted_or.test 2013-03-19 18:58:43 +0900 (b68453e) @@ -21,5 +21,5 @@ load --table Synonyms ["OR", ["or"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query '"OR"' Renamed: test/command/suite/select/query_expander/column/vector/with_space.expected (+1 -1) 89% =================================================================== --- test/command/suite/select/query_expansion/vector/with_space.expected 2013-03-19 10:50:57 +0900 (22330af) +++ test/command/suite/select/query_expander/column/vector/with_space.expected 2013-03-19 18:58:43 +0900 (022133b) @@ -24,7 +24,7 @@ load --table Synonyms ["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"' +select --table Memos --query_expander Synonyms.words --match_columns content --query '"groonga storage engine"' [ [ 0, Renamed: test/command/suite/select/query_expander/column/vector/with_space.test (+1 -1) 91% =================================================================== --- test/command/suite/select/query_expansion/vector/with_space.test 2013-03-19 10:50:57 +0900 (31bafb1) +++ test/command/suite/select/query_expander/column/vector/with_space.test 2013-03-19 18:58:43 +0900 (865e8e0) @@ -21,5 +21,5 @@ load --table Synonyms ["groonga storage engine", ["groonga storage engine", "mroonga"]] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos --query_expander Synonyms.words \ --match_columns content --query '"groonga storage engine"' Renamed: test/command/suite/select/query_expander/proc/tsv/expand.expected (+1 -1) 89% =================================================================== --- test/command/suite/select/query_expansion/query_expander/tsv/expand.expected 2013-03-19 10:50:57 +0900 (91bc399) +++ test/command/suite/select/query_expander/proc/tsv/expand.expected 2013-03-19 18:58:43 +0900 (548eb59) @@ -18,7 +18,7 @@ load --table Memos ["Learning Ruby and groonga..."] ] [[0,0.0,0.0],5] -select --table Memos --query_expansion QueryExpanderTSV --match_columns content --query rroonga +select --table Memos --query_expander QueryExpanderTSV --match_columns content --query rroonga [ [ 0, Renamed: test/command/suite/select/query_expander/proc/tsv/expand.test (+1 -1) 90% =================================================================== --- test/command/suite/select/query_expansion/query_expander/tsv/expand.test 2013-03-19 10:50:57 +0900 (53e57ce) +++ test/command/suite/select/query_expander/proc/tsv/expand.test 2013-03-19 18:58:43 +0900 (963f516) @@ -17,6 +17,6 @@ load --table Memos ["Learning Ruby and groonga..."] ] -select --table Memos --query_expansion QueryExpanderTSV \ +select --table Memos --query_expander QueryExpanderTSV \ --match_columns content --query rroonga Renamed: test/command/suite/select/query_expansion/with_expander.expected (+7 -9) 69% =================================================================== --- test/command/suite/select/query_expansion/vector/column_match_without_space.expected 2013-03-19 10:50:57 +0900 (684f766) +++ test/command/suite/select/query_expansion/with_expander.expected 2013-03-19 18:58:43 +0900 (4d08a3a) @@ -8,7 +8,9 @@ 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 +column_create Synonyms expansion COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +column_create Synonyms expander COLUMN_SCALAR ShortText [[0,0.0,0.0],true] load --table Memos [ @@ -21,11 +23,11 @@ load --table Memos [[0,0.0,0.0],4] load --table Synonyms [ -["_key", "words"], -["groonga", ["groonga", "rroonga", "mroonga"]] +["_key", "expansion", "expander"], +["groonga", "(groonga OR rroonga OR mroonga)", "(groonga OR rroonga)"] ] [[0,0.0,0.0],1] -select --table Memos --query_expansion Synonyms.words --query 'content:@groonga' +select --table Memos --query_expansion Synonyms.expansion --query_expander Synonyms.expander --match_columns content --query groonga [ [ 0, @@ -35,7 +37,7 @@ select --table Memos --query_expansion Synonyms.words --query 'content:@groonga' [ [ [ - 3 + 2 ], [ [ @@ -54,10 +56,6 @@ select --table Memos --query_expansion Synonyms.words --query 'content:@groonga' [ 3, "Start rroonga!" - ], - [ - 2, - "Start mroonga!" ] ] ] Renamed: test/command/suite/select/query_expansion/with_expander.test (+7 -4) 59% =================================================================== --- test/command/suite/select/query_expansion/vector/one_word.test 2013-03-19 10:50:57 +0900 (2d0b79d) +++ test/command/suite/select/query_expansion/with_expander.test 2013-03-19 18:58:43 +0900 (945ed0b) @@ -5,7 +5,8 @@ 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 +column_create Synonyms expansion COLUMN_SCALAR ShortText +column_create Synonyms expander COLUMN_SCALAR ShortText load --table Memos [ @@ -18,9 +19,11 @@ load --table Memos load --table Synonyms [ -["_key", "words"], -["groonga", ["groonga", "rroonga", "mroonga"]] +["_key", "expansion", "expander"], +["groonga", "(groonga OR rroonga OR mroonga)", "(groonga OR rroonga)"] ] -select --table Memos --query_expansion Synonyms.words \ +select --table Memos \ + --query_expansion Synonyms.expansion \ + --query_expander Synonyms.expander \ --match_columns content --query groonga Renamed: test/command/suite/select/query_expansion/without_expander.expected (+0 -0) 100% =================================================================== Renamed: test/command/suite/select/query_expansion/without_expander.test (+0 -0) 100% =================================================================== -------------- next part -------------- HTML����������������������������...下载
