naoa
null+****@clear*****
Mon Feb 1 16:34:25 JST 2016
naoa 2016-02-01 16:34:25 +0900 (Mon, 01 Feb 2016) New Revision: cdacb5ba398681e3f189096c5e224724991bdd63 https://github.com/groonga/groonga/commit/cdacb5ba398681e3f189096c5e224724991bdd63 Merged 2d929d3: Merge pull request #460 from naoa/pat-fussy-search Message: pat: return grn_rc if grn_pat_error_if_truncated in pat_fuzzy_search() Modified files: lib/pat.c Modified: lib/pat.c (+8 -6) =================================================================== --- lib/pat.c 2016-02-01 16:28:45 +0900 (7185389) +++ lib/pat.c 2016-02-01 16:34:25 +0900 (47d9d8c) @@ -1396,17 +1396,19 @@ grn_pat_fuzzy_search(grn_ctx *ctx, grn_pat *pat, const char *s = key; const char *e = (const char *)key + key_size; fuzzy_node last_node; - PAT_AT(pat, GRN_ID_NIL, node); - id = node->lr[1]; - + grn_rc rc = grn_pat_error_if_truncated(ctx, pat); + if (rc != GRN_SUCCESS) { + return rc; + } if (key_size > GRN_TABLE_MAX_KEY_SIZE || max_distance > GRN_TABLE_MAX_KEY_SIZE || prefix_match_size > key_size) { return GRN_INVALID_ARGUMENT; } - if (grn_pat_error_if_truncated(ctx, pat) != GRN_SUCCESS) { - return GRN_ID_NIL; - } + + PAT_AT(pat, GRN_ID_NIL, node); + id = node->lr[1]; + if (prefix_match_size) { grn_pat_cursor *cur; if ((cur = grn_pat_cursor_open(ctx, pat, key, prefix_match_size, -------------- next part -------------- HTML����������������������������...Download