Kouhei Sutou
null+****@clear*****
Sat Feb 20 20:40:41 JST 2016
Kouhei Sutou 2016-02-20 20:40:41 +0900 (Sat, 20 Feb 2016) New Revision: 1759f941c6bc8f208b0e44d22e27bd989460f1fc https://github.com/groonga/groonga/commit/1759f941c6bc8f208b0e44d22e27bd989460f1fc Message: Remove needless "_full" snippet_full() -> snippet() Modified files: lib/grn_proc.h lib/proc.c lib/proc/proc_snippet.c Renamed files: test/command/suite/select/function/snippet/cache.expected (from test/command/suite/select/function/snippet_full/cache.expected) test/command/suite/select/function/snippet/cache.test (from test/command/suite/select/function/snippet_full/cache.test) test/command/suite/select/function/snippet/default.expected (from test/command/suite/select/function/snippet_full/default.expected) test/command/suite/select/function/snippet/default.test (from test/command/suite/select/function/snippet_full/default.test) test/command/suite/select/function/snippet/default_tag.expected (from test/command/suite/select/function/snippet_full/default_tag.expected) test/command/suite/select/function/snippet/default_tag.test (from test/command/suite/select/function/snippet_full/default_tag.test) test/command/suite/select/function/snippet/empty_option.expected (from test/command/suite/select/function/snippet_full/empty_option.expected) test/command/suite/select/function/snippet/empty_option.test (from test/command/suite/select/function/snippet_full/empty_option.test) test/command/suite/select/function/snippet/html_escape.expected (from test/command/suite/select/function/snippet_full/html_escape.expected) test/command/suite/select/function/snippet/html_escape.test (from test/command/suite/select/function/snippet_full/html_escape.test) test/command/suite/select/function/snippet/leading_space.expected (from test/command/suite/select/function/snippet_full/leading_space.expected) test/command/suite/select/function/snippet/leading_space.test (from test/command/suite/select/function/snippet_full/leading_space.test) test/command/suite/select/function/snippet/max_results.expected (from test/command/suite/select/function/snippet_full/max_results.expected) test/command/suite/select/function/snippet/max_results.test (from test/command/suite/select/function/snippet_full/max_results.test) test/command/suite/select/function/snippet/no_normalizer.expected (from test/command/suite/select/function/snippet_full/no_normalizer.expected) test/command/suite/select/function/snippet/no_normalizer.test (from test/command/suite/select/function/snippet_full/no_normalizer.test) test/command/suite/select/function/snippet/normalizer.expected (from test/command/suite/select/function/snippet_full/normalizer.expected) test/command/suite/select/function/snippet/normalizer.test (from test/command/suite/select/function/snippet_full/normalizer.test) test/command/suite/select/function/snippet/prefix.expected (from test/command/suite/select/function/snippet_full/prefix.expected) test/command/suite/select/function/snippet/prefix.test (from test/command/suite/select/function/snippet_full/prefix.test) test/command/suite/select/function/snippet/suffix.expected (from test/command/suite/select/function/snippet_full/suffix.expected) test/command/suite/select/function/snippet/suffix.test (from test/command/suite/select/function/snippet_full/suffix.test) test/command/suite/select/function/snippet/twice_keyword.expected (from test/command/suite/select/function/snippet_full/twice_keyword.expected) test/command/suite/select/function/snippet/twice_keyword.test (from test/command/suite/select/function/snippet_full/twice_keyword.test) Modified: lib/grn_proc.h (+1 -1) =================================================================== --- lib/grn_proc.h 2016-02-20 20:37:47 +0900 (0693510) +++ lib/grn_proc.h 2016-02-20 20:40:41 +0900 (3a75946) @@ -44,7 +44,7 @@ void grn_proc_init_lock_release(grn_ctx *ctx); void grn_proc_init_object_exist(grn_ctx *ctx); void grn_proc_init_object_remove(grn_ctx *ctx); void grn_proc_init_schema(grn_ctx *ctx); -void grn_proc_init_snippet_full(grn_ctx *ctx); +void grn_proc_init_snippet(grn_ctx *ctx); void grn_proc_init_snippet_html(grn_ctx *ctx); void grn_proc_init_table_create(grn_ctx *ctx); void grn_proc_init_table_list(grn_ctx *ctx); Modified: lib/proc.c (+1 -1) =================================================================== --- lib/proc.c 2016-02-20 20:37:47 +0900 (b2bcc0d) +++ lib/proc.c 2016-02-20 20:40:41 +0900 (99e32b2) @@ -6660,5 +6660,5 @@ grn_db_init_builtin_query(grn_ctx *ctx) grn_proc_init_object_remove(ctx); - grn_proc_init_snippet_full(ctx); + grn_proc_init_snippet(ctx); } Modified: lib/proc/proc_snippet.c (+13 -13) =================================================================== --- lib/proc/proc_snippet.c 2016-02-20 20:37:47 +0900 (c4f07cb) +++ lib/proc/proc_snippet.c 2016-02-20 20:40:41 +0900 (c2f802a) @@ -19,8 +19,8 @@ #include <groonga/plugin.h> #include <string.h> -#define GRN_FUNC_SNIPPET_HTML_CACHE_NAME "$snippet_html" -#define GRN_FUNC_SNIPPET_FULL_CACHE_NAME "$snippet_full" +#define GRN_FUNC_SNIPPET_CACHE_NAME "$snippet" +#define GRN_FUNC_SNIPPET_HTML_CACHE_NAME "$snippet_html" static grn_obj * snippet_exec(grn_ctx *ctx, grn_obj *snip, grn_obj *text, @@ -146,7 +146,7 @@ func_snippet_html(grn_ctx *ctx, int nargs, grn_obj **args, } static grn_obj * -func_snippet_full(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) +func_snippet(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) { grn_obj *snippets = NULL; @@ -184,7 +184,7 @@ func_snippet_full(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_d grn_obj *value; if (hash->header.type != GRN_TABLE_HASH_KEY) { GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, - "snippet_full(): " + "snippet(): " "end argument must be object literal: <%.*s>", (int)GRN_TEXT_LEN(args[nargs - 1]), GRN_TEXT_VALUE(args[nargs - 1])); @@ -197,7 +197,7 @@ func_snippet_full(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_d 0, -1, 0); if (!cursor) { GRN_PLUGIN_ERROR(ctx, GRN_NO_MEMORY_AVAILABLE, - "snippet_full(): couldn't open cursor"); + "snippet(): couldn't open cursor"); goto exit; } while (grn_hash_cursor_next(ctx, cursor) != GRN_ID_NIL) { @@ -246,15 +246,15 @@ func_snippet_full(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_d grn_proc_get_info(ctx, user_data, NULL, NULL, &expression); snip_ptr = grn_expr_get_var(ctx, expression, - GRN_FUNC_SNIPPET_FULL_CACHE_NAME, - strlen(GRN_FUNC_SNIPPET_FULL_CACHE_NAME)); + GRN_FUNC_SNIPPET_CACHE_NAME, + strlen(GRN_FUNC_SNIPPET_CACHE_NAME)); if (snip_ptr) { snip = GRN_PTR_VALUE(snip_ptr); } else { snip_ptr = grn_expr_get_or_add_var(ctx, expression, - GRN_FUNC_SNIPPET_FULL_CACHE_NAME, - strlen(GRN_FUNC_SNIPPET_FULL_CACHE_NAME)); + GRN_FUNC_SNIPPET_CACHE_NAME, + strlen(GRN_FUNC_SNIPPET_CACHE_NAME)); GRN_OBJ_FIN(ctx, snip_ptr); GRN_PTR_INIT(snip_ptr, GRN_OBJ_OWN, GRN_DB_OBJECT); @@ -275,7 +275,7 @@ func_snippet_full(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_d GRN_TEXT_INIT(&inspected, 0); grn_inspect(ctx, &inspected, normalizer); GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, - "snippet_full(): not normalizer: <%.*s>", + "snippet(): not normalizer: <%.*s>", (int)GRN_TEXT_LEN(&inspected), GRN_TEXT_VALUE(&inspected)); GRN_OBJ_FIN(ctx, &inspected); @@ -331,10 +331,10 @@ exit : void -grn_proc_init_snippet_full(grn_ctx *ctx) +grn_proc_init_snippet(grn_ctx *ctx) { - grn_proc_create(ctx, "snippet_full", -1, GRN_PROC_FUNCTION, - func_snippet_full, NULL, NULL, 0, NULL); + grn_proc_create(ctx, "snippet", -1, GRN_PROC_FUNCTION, + func_snippet, NULL, NULL, 0, NULL); } void Renamed: test/command/suite/select/function/snippet/cache.expected (+2 -2) 78% =================================================================== --- test/command/suite/select/function/snippet_full/cache.expected 2016-02-20 20:37:47 +0900 (ee16108) +++ test/command/suite/select/function/snippet/cache.expected 2016-02-20 20:40:41 +0900 (fa8565c) @@ -8,7 +8,7 @@ load --table Entries {"content": "<p>pgroonga and PostgreSQL</p>"} ] [[0,0.0,0.0],2] -select Entries --output_columns ' snippet_full(content, "SQL", "<span class=\\"keyword\\">", "</span>" )' --command_version 2 +select Entries --output_columns ' snippet(content, "SQL", "<span class=\\"keyword\\">", "</span>" )' --command_version 2 [ [ 0, @@ -22,7 +22,7 @@ select Entries --output_columns ' snippet_full(content, "SQL", "<span clas ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/cache.test (+1 -1) 92% =================================================================== --- test/command/suite/select/function/snippet_full/cache.test 2016-02-20 20:37:47 +0900 (cffaaf1) +++ test/command/suite/select/function/snippet/cache.test 2016-02-20 20:40:41 +0900 (b41ac37) @@ -9,7 +9,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "SQL", "<span class=\\"keyword\\">", "</span>" \ )' \ --command_version 2 Renamed: test/command/suite/select/function/snippet/default.expected (+2 -2) 73% =================================================================== --- test/command/suite/select/function/snippet_full/default.expected 2016-02-20 20:37:47 +0900 (355d1bf) +++ test/command/suite/select/function/snippet/default.expected 2016-02-20 20:40:41 +0900 (601220c) @@ -7,7 +7,7 @@ load --table Entries {"content": "<p>groonga and MySQL</p>"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "Groonga", "<span class=\\"keyword\\">", "</span>" )' --command_version 2 +select Entries --output_columns ' snippet(content, "Groonga", "<span class=\\"keyword\\">", "</span>" )' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "Groonga", "<span ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/default.test (+1 -1) 91% =================================================================== --- test/command/suite/select/function/snippet_full/default.test 2016-02-20 20:37:47 +0900 (1c18f09) +++ test/command/suite/select/function/snippet/default.test 2016-02-20 20:40:41 +0900 (963eaea) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "Groonga", "<span class=\\"keyword\\">", "</span>" \ )' \ --command_version 2 Renamed: test/command/suite/select/function/snippet/default_tag.expected (+2 -2) 68% =================================================================== --- test/command/suite/select/function/snippet_full/default_tag.expected 2016-02-20 20:37:47 +0900 (3d695ce) +++ test/command/suite/select/function/snippet/default_tag.expected 2016-02-20 20:40:41 +0900 (59044d2) @@ -7,7 +7,7 @@ load --table Entries {"content": "<p>groonga and MySQL</p>"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "Groonga", "MySQL", {"default_open_tag": "<span>", "default_close_tag": "</span>"} )' --command_version 2 +select Entries --output_columns ' snippet(content, "Groonga", "MySQL", {"default_open_tag": "<span>", "default_close_tag": "</span>"} )' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "Groonga", "MySQL" ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/default_tag.test (+1 -1) 92% =================================================================== --- test/command/suite/select/function/snippet_full/default_tag.test 2016-02-20 20:37:47 +0900 (8d04e55) +++ test/command/suite/select/function/snippet/default_tag.test 2016-02-20 20:40:41 +0900 (4996176) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "Groonga", "MySQL", \ {"default_open_tag": "<span>", "default_close_tag": "</span>"} \ )' \ Renamed: test/command/suite/select/function/snippet/empty_option.expected (+2 -2) 72% =================================================================== --- test/command/suite/select/function/snippet_full/empty_option.expected 2016-02-20 20:37:47 +0900 (72d7e9a) +++ test/command/suite/select/function/snippet/empty_option.expected 2016-02-20 20:40:41 +0900 (bd9ff54) @@ -7,7 +7,7 @@ load --table Entries {"content": "<p>groonga and MySQL</p>"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "Groonga", "<span class=\\"keyword\\">", "</span>", {} )' --command_version 2 +select Entries --output_columns ' snippet(content, "Groonga", "<span class=\\"keyword\\">", "</span>", {} )' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "Groonga", "<span ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/empty_option.test (+1 -1) 91% =================================================================== --- test/command/suite/select/function/snippet_full/empty_option.test 2016-02-20 20:37:47 +0900 (7f2c383) +++ test/command/suite/select/function/snippet/empty_option.test 2016-02-20 20:40:41 +0900 (23083b8) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "Groonga", "<span class=\\"keyword\\">", "</span>", \ {} \ )' \ Renamed: test/command/suite/select/function/snippet/html_escape.expected (+2 -2) 71% =================================================================== --- test/command/suite/select/function/snippet_full/html_escape.expected 2016-02-20 20:37:47 +0900 (ce6fe9f) +++ test/command/suite/select/function/snippet/html_escape.expected 2016-02-20 20:40:41 +0900 (bc443ad) @@ -7,7 +7,7 @@ load --table Entries {"content": "<p>groonga and MySQL</p>"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "groonga", "<span class=\\"keyword\\">", "</span>", {"html_escape": true})' --command_version 2 +select Entries --output_columns ' snippet(content, "groonga", "<span class=\\"keyword\\">", "</span>", {"html_escape": true})' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "groonga", "<span ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/html_escape.test (+1 -1) 92% =================================================================== --- test/command/suite/select/function/snippet_full/html_escape.test 2016-02-20 20:37:47 +0900 (3e48d46) +++ test/command/suite/select/function/snippet/html_escape.test 2016-02-20 20:40:41 +0900 (0ec26b1) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "groonga", "<span class=\\"keyword\\">", "</span>", \ {"html_escape": true})' \ --command_version 2 Renamed: test/command/suite/select/function/snippet/leading_space.expected (+2 -2) 68% =================================================================== --- test/command/suite/select/function/snippet_full/leading_space.expected 2016-02-20 20:37:47 +0900 (7ee2279) +++ test/command/suite/select/function/snippet/leading_space.expected 2016-02-20 20:40:41 +0900 (6fdbe52) @@ -7,7 +7,7 @@ load --table Entries {"content": "groonga and MySQL"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "MySQL", "<span class=\\"keyword\\">", "</span>", {"skip_leading_spaces": false} )' --command_version 2 +select Entries --output_columns ' snippet(content, "MySQL", "<span class=\\"keyword\\">", "</span>", {"skip_leading_spaces": false} )' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "MySQL", "<span cl ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/leading_space.test (+1 -1) 92% =================================================================== --- test/command/suite/select/function/snippet_full/leading_space.test 2016-02-20 20:37:47 +0900 (a957d8b) +++ test/command/suite/select/function/snippet/leading_space.test 2016-02-20 20:40:41 +0900 (75f6d32) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "MySQL", "<span class=\\"keyword\\">", "</span>", \ {"skip_leading_spaces": false} \ )' \ Renamed: test/command/suite/select/function/snippet/max_results.expected (+2 -2) 71% =================================================================== --- test/command/suite/select/function/snippet_full/max_results.expected 2016-02-20 20:37:47 +0900 (58c32a2) +++ test/command/suite/select/function/snippet/max_results.expected 2016-02-20 20:40:41 +0900 (f7be84b) @@ -7,7 +7,7 @@ load --table Entries {"content": "groonga and MySQL and PosrgreSQL"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "SQL", "<span class=\\"keyword\\">", "</span>", {"width": 10, "max_n_results": 2} )' --command_version 2 +select Entries --output_columns ' snippet(content, "SQL", "<span class=\\"keyword\\">", "</span>", {"width": 10, "max_n_results": 2} )' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "SQL", "<span clas ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/max_results.test (+1 -1) 92% =================================================================== --- test/command/suite/select/function/snippet_full/max_results.test 2016-02-20 20:37:47 +0900 (c43d12e) +++ test/command/suite/select/function/snippet/max_results.test 2016-02-20 20:40:41 +0900 (93af13f) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "SQL", "<span class=\\"keyword\\">", "</span>", \ {"width": 10, "max_n_results": 2} \ )' \ Renamed: test/command/suite/select/function/snippet/no_normalizer.expected (+2 -2) 72% =================================================================== --- test/command/suite/select/function/snippet_full/no_normalizer.expected 2016-02-20 20:37:47 +0900 (d784787) +++ test/command/suite/select/function/snippet/no_normalizer.expected 2016-02-20 20:40:41 +0900 (a73b23b) @@ -7,7 +7,7 @@ load --table Entries {"content": "MySQL is a kind of sql database server"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "sql", "<span class=\\"keyword\\">", "</span>", {"normalizer": ""} )' --command_version 2 +select Entries --output_columns ' snippet(content, "sql", "<span class=\\"keyword\\">", "</span>", {"normalizer": ""} )' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "sql", "<span clas ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/no_normalizer.test (+1 -1) 92% =================================================================== --- test/command/suite/select/function/snippet_full/no_normalizer.test 2016-02-20 20:37:47 +0900 (342e077) +++ test/command/suite/select/function/snippet/no_normalizer.test 2016-02-20 20:40:41 +0900 (c8f7dea) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "sql", "<span class=\\"keyword\\">", "</span>", \ {"normalizer": ""} \ )' \ Renamed: test/command/suite/select/function/snippet/normalizer.expected (+2 -2) 71% =================================================================== --- test/command/suite/select/function/snippet_full/normalizer.expected 2016-02-20 20:37:47 +0900 (8e3b069) +++ test/command/suite/select/function/snippet/normalizer.expected 2016-02-20 20:40:41 +0900 (bacbe1e) @@ -7,7 +7,7 @@ load --table Entries {"content": "groonga and MySQL and PosrgreSQL"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "sql", "<span class=\\"keyword\\">", "</span>", {"normalizer": "NormalizerAuto"} )' --command_version 2 +select Entries --output_columns ' snippet(content, "sql", "<span class=\\"keyword\\">", "</span>", {"normalizer": "NormalizerAuto"} )' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "sql", "<span clas ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/normalizer.test (+1 -1) 92% =================================================================== --- test/command/suite/select/function/snippet_full/normalizer.test 2016-02-20 20:37:47 +0900 (6c71c41) +++ test/command/suite/select/function/snippet/normalizer.test 2016-02-20 20:40:41 +0900 (59d5aeb) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "sql", "<span class=\\"keyword\\">", "</span>", \ {"normalizer": "NormalizerAuto"} \ )' \ Renamed: test/command/suite/select/function/snippet/prefix.expected (+2 -2) 73% =================================================================== --- test/command/suite/select/function/snippet_full/prefix.expected 2016-02-20 20:37:47 +0900 (c7ffe62) +++ test/command/suite/select/function/snippet/prefix.expected 2016-02-20 20:40:41 +0900 (965ded7) @@ -7,7 +7,7 @@ load --table Entries {"content": "groonga and MySQL and PosrgreSQL"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "SQL", "<span class=\\"w1\\">", "</span>", {"prefix": "..."} )' --command_version 2 +select Entries --output_columns ' snippet(content, "SQL", "<span class=\\"w1\\">", "</span>", {"prefix": "..."} )' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "SQL", "<span clas ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/prefix.test (+1 -1) 92% =================================================================== --- test/command/suite/select/function/snippet_full/prefix.test 2016-02-20 20:37:47 +0900 (0867ef5) +++ test/command/suite/select/function/snippet/prefix.test 2016-02-20 20:40:41 +0900 (95c7209) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "SQL", "<span class=\\"w1\\">", "</span>", \ {"prefix": "..."} \ )' \ Renamed: test/command/suite/select/function/snippet/suffix.expected (+2 -2) 73% =================================================================== --- test/command/suite/select/function/snippet_full/suffix.expected 2016-02-20 20:37:47 +0900 (4e60a10) +++ test/command/suite/select/function/snippet/suffix.expected 2016-02-20 20:40:41 +0900 (3d6e46e) @@ -7,7 +7,7 @@ load --table Entries {"content": "groonga and MySQL and PosrgreSQL"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "SQL", "<span class=\\"keyword\\">", "</span>", {"suffix": "..."} )' --command_version 2 +select Entries --output_columns ' snippet(content, "SQL", "<span class=\\"keyword\\">", "</span>", {"suffix": "..."} )' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "SQL", "<span clas ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/suffix.test (+1 -1) 92% =================================================================== --- test/command/suite/select/function/snippet_full/suffix.test 2016-02-20 20:37:47 +0900 (9ae101a) +++ test/command/suite/select/function/snippet/suffix.test 2016-02-20 20:40:41 +0900 (c414dad) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "SQL", "<span class=\\"keyword\\">", "</span>", \ {"suffix": "..."} \ )' \ Renamed: test/command/suite/select/function/snippet/twice_keyword.expected (+2 -2) 69% =================================================================== --- test/command/suite/select/function/snippet_full/twice_keyword.expected 2016-02-20 20:37:47 +0900 (92e4b0b) +++ test/command/suite/select/function/snippet/twice_keyword.expected 2016-02-20 20:40:41 +0900 (be49496) @@ -7,7 +7,7 @@ load --table Entries {"content": "groonga and MySQL and PosrgreSQL"} ] [[0,0.0,0.0],1] -select Entries --output_columns ' snippet_full(content, "SQL", "<span class=\\"keyword1\\">", "</span>", "groonga", "<span class=\\"keyword2\\">", "</span>", {"prefix": "..."} )' --command_version 2 +select Entries --output_columns ' snippet(content, "SQL", "<span class=\\"keyword1\\">", "</span>", "groonga", "<span class=\\"keyword2\\">", "</span>", {"prefix": "..."} )' --command_version 2 [ [ 0, @@ -21,7 +21,7 @@ select Entries --output_columns ' snippet_full(content, "SQL", "<span clas ], [ [ - "snippet_full", + "snippet", "null" ] ], Renamed: test/command/suite/select/function/snippet/twice_keyword.test (+1 -1) 93% =================================================================== --- test/command/suite/select/function/snippet_full/twice_keyword.test 2016-02-20 20:37:47 +0900 (73c0260) +++ test/command/suite/select/function/snippet/twice_keyword.test 2016-02-20 20:40:41 +0900 (b0e288a) @@ -8,7 +8,7 @@ load --table Entries select Entries \ --output_columns ' \ - snippet_full(content, \ + snippet(content, \ "SQL", "<span class=\\"keyword1\\">", "</span>", \ "groonga", "<span class=\\"keyword2\\">", "</span>", \ {"prefix": "..."} \ -------------- next part -------------- HTML����������������������������...Download