Kouhei Sutou
null+****@clear*****
Fri Feb 5 17:38:45 JST 2016
Kouhei Sutou 2016-02-05 17:38:45 +0900 (Fri, 05 Feb 2016) New Revision: 229e278615683e68d7852be4097e2cb6d194ed7c https://github.com/groonga/groonga/commit/229e278615683e68d7852be4097e2cb6d194ed7c Message: Add missing "search_" Modified files: include/groonga/groonga.h lib/db.c lib/grn_db.h lib/grn_ii.h lib/grn_pat.h lib/ii.c lib/pat.c test/unit/core/test-patricia-trie-search.c Modified: include/groonga/groonga.h (+3 -3) =================================================================== --- include/groonga/groonga.h 2016-02-05 17:29:29 +0900 (55e384f) +++ include/groonga/groonga.h 2016-02-05 17:38:45 +0900 (c0c1f92) @@ -935,9 +935,9 @@ GRN_API grn_id grn_obj_id(grn_ctx *ctx, grn_obj *obj); #define GRN_TABLE_FUZZY_WITH_TRANSPOSITION (0x01) -typedef struct _grn_fuzzy_optarg grn_fuzzy_optarg; +typedef struct _grn_fuzzy_search_optarg grn_fuzzy_search_optarg; -struct _grn_fuzzy_optarg { +struct _grn_fuzzy_search_optarg { unsigned int max_distance; unsigned int max_expansion; unsigned int prefix_match_size; @@ -957,7 +957,7 @@ struct _grn_search_optarg { grn_obj *scorer; grn_obj *scorer_args_expr; unsigned int scorer_args_expr_offset; - grn_fuzzy_optarg fuzzy; + grn_fuzzy_search_optarg fuzzy; }; GRN_API grn_rc grn_obj_search(grn_ctx *ctx, grn_obj *obj, grn_obj *query, Modified: lib/db.c (+1 -1) =================================================================== --- lib/db.c 2016-02-05 17:29:29 +0900 (56e2c07) +++ lib/db.c 2016-02-05 17:38:45 +0900 (f0cbe01) @@ -2915,7 +2915,7 @@ grn_table_search(grn_ctx *ctx, grn_obj *table, const void *key, uint32_t key_siz grn_rc grn_table_fuzzy_search(grn_ctx *ctx, grn_obj *table, const void *key, uint32_t key_size, - grn_fuzzy_optarg *args, grn_obj *res) + grn_fuzzy_search_optarg *args, grn_obj *res) { grn_rc rc = GRN_SUCCESS; GRN_API_ENTER; Modified: lib/grn_db.h (+1 -1) =================================================================== --- lib/grn_db.h 2016-02-05 17:29:29 +0900 (5b30fd9) +++ lib/grn_db.h 2016-02-05 17:38:45 +0900 (5ac98b1) @@ -85,7 +85,7 @@ grn_rc grn_table_search(grn_ctx *ctx, grn_obj *table, grn_rc grn_table_fuzzy_search(grn_ctx *ctx, grn_obj *table, const void *key, uint32_t key_size, - grn_fuzzy_optarg *args, grn_obj *res); + grn_fuzzy_search_optarg *args, grn_obj *res); grn_id grn_table_next(grn_ctx *ctx, grn_obj *table, grn_id id); Modified: lib/grn_ii.h (+1 -1) =================================================================== --- lib/grn_ii.h 2016-02-05 17:29:29 +0900 (432abac) +++ lib/grn_ii.h 2016-02-05 17:38:45 +0900 (8e91c4f) @@ -143,7 +143,7 @@ struct _grn_select_optarg { grn_obj *scorer; grn_obj *scorer_args_expr; unsigned int scorer_args_expr_offset; - grn_fuzzy_optarg fuzzy; + grn_fuzzy_search_optarg fuzzy; }; GRN_API grn_rc grn_ii_column_update(grn_ctx *ctx, grn_ii *ii, grn_id id, Modified: lib/grn_pat.h (+1 -1) =================================================================== --- lib/grn_pat.h 2016-02-05 17:29:29 +0900 (62b341e) +++ lib/grn_pat.h 2016-02-05 17:38:45 +0900 (6886e90) @@ -110,7 +110,7 @@ void grn_pat_cache_disable(grn_ctx *ctx, grn_pat *pat); GRN_API grn_rc grn_pat_fuzzy_search(grn_ctx *ctx, grn_pat *pat, const void *key, unsigned int key_size, - grn_fuzzy_optarg *args, grn_hash *h); + grn_fuzzy_search_optarg *args, grn_hash *h); uint32_t grn_pat_total_key_size(grn_ctx *ctx, grn_pat *pat); Modified: lib/ii.c (+2 -2) =================================================================== --- lib/ii.c 2016-02-05 17:29:29 +0900 (7ef31a7) +++ lib/ii.c 2016-02-05 17:38:45 +0900 (bf84a7a) @@ -5528,7 +5528,7 @@ token_info_close(grn_ctx *ctx, token_info *ti) inline static token_info * token_info_open(grn_ctx *ctx, grn_obj *lexicon, grn_ii *ii, const char *key, unsigned int key_size, uint32_t offset, int mode, - grn_fuzzy_optarg *args) + grn_fuzzy_search_optarg *args) { int s = 0; grn_hash *h; @@ -5772,7 +5772,7 @@ inline static grn_rc token_info_build_fuzzy(grn_ctx *ctx, grn_obj *lexicon, grn_ii *ii, const char *string, unsigned int string_len, token_info **tis, uint32_t *n, grn_bool *only_skip_token, - grn_operator mode, grn_fuzzy_optarg *args) + grn_operator mode, grn_fuzzy_search_optarg *args) { token_info *ti; grn_rc rc = GRN_END_OF_DATA; Modified: lib/pat.c (+1 -1) =================================================================== --- lib/pat.c 2016-02-05 17:29:29 +0900 (566d05d) +++ lib/pat.c 2016-02-05 17:38:45 +0900 (0ab7f06) @@ -1440,7 +1440,7 @@ _grn_pat_fuzzy_search(grn_ctx *ctx, grn_pat *pat, grn_id id, grn_rc grn_pat_fuzzy_search(grn_ctx *ctx, grn_pat *pat, const void *key, uint32_t key_size, - grn_fuzzy_optarg *args, grn_hash *h) + grn_fuzzy_search_optarg *args, grn_hash *h) { pat_node *node; grn_id id; Modified: test/unit/core/test-patricia-trie-search.c (+1 -1) =================================================================== --- test/unit/core/test-patricia-trie-search.c 2016-02-05 17:29:29 +0900 (4dff853) +++ test/unit/core/test-patricia-trie-search.c 2016-02-05 17:38:45 +0900 (b94ec67) @@ -426,7 +426,7 @@ test_fuzzy_search(gconstpointer data) const gchar key4[] = "bbbb"; const gchar key5[] = "bbbbb"; const gchar key6[] = "cdefg"; - grn_fuzzy_optarg args; + grn_fuzzy_search_optarg args; args.prefix_match_size = 0; args.max_distance = 1; args.max_expansion = 0; -------------- next part -------------- HTML����������������������������...Download
