Naoya Murakami
null+****@clear*****
Sun Aug 14 13:35:53 JST 2016
Naoya Murakami 2016-08-14 13:35:53 +0900 (Sun, 14 Aug 2016) New Revision: 19b5dc3d382b122c5c306b07c73a0598c7fd836c https://github.com/groonga/groonga/commit/19b5dc3d382b122c5c306b07c73a0598c7fd836c Merged 2634b82: Merge pull request #590 from naoa/fix-bug-fuzzy-preifx Message: pat_fuzzy: fix a bug that prefix_match_size option returns wrong node Modified files: lib/pat.c test/command/suite/select/function/fuzzy_search/object_literal/prefix_length.expected test/command/suite/select/function/fuzzy_search/object_literal/prefix_length.test Modified: lib/pat.c (+42 -11) =================================================================== --- lib/pat.c 2016-08-08 22:59:15 +0900 (20db00e) +++ lib/pat.c 2016-08-14 13:35:53 +0900 (c5e2b17) @@ -1235,6 +1235,42 @@ grn_pat_lcp_search(grn_ctx *ctx, grn_pat *pat, const void *key, uint32_t key_siz return r2; } +static grn_id +common_prefix_pat_node_get(grn_ctx *ctx, grn_pat *pat, const void *key, uint32_t key_size) +{ + int c0 = -1, c; + const uint8_t *k; + uint32_t len = key_size * 16; + grn_id r; + pat_node *rn; + uint8_t keybuf[MAX_FIXED_KEY_SIZE]; + + KEY_ENCODE(pat, keybuf, key, key_size); + PAT_AT(pat, 0, rn); + r = rn->lr[1]; + while (r) { + PAT_AT(pat, r, rn); + if (!rn) { return GRN_ID_NIL; } + c = PAT_CHK(rn); + if (c0 < c && c < len - 1) { + if (c & 1) { + r = (c + 1 < len) ? rn->lr[1] : rn->lr[0]; + } else { + r = rn->lr[nth_bit((uint8_t *)key, c, len)]; + } + c0 = c; + continue; + } + if (!(k = pat_node_get_key(ctx, pat, rn))) { break; } + if (PAT_LEN(rn) < key_size) { break; } + if (!memcmp(k, key, key_size)) { + return r; + } + break; + } + return GRN_ID_NIL; +} + typedef struct { grn_id id; uint16_t distance; @@ -1492,17 +1528,12 @@ grn_pat_fuzzy_search(grn_ctx *ctx, grn_pat *pat, id = node->lr[1]; if (prefix_match_size) { - grn_pat_cursor *cur; - if ((cur = grn_pat_cursor_open(ctx, pat, key, prefix_match_size, - NULL, 0, 0, -1, GRN_CURSOR_PREFIX))) { - grn_id tid; - tid = grn_pat_cursor_next(ctx, cur); - grn_pat_cursor_close(ctx, cur); - if (tid) { - id = tid; - } else { - return GRN_END_OF_DATA; - } + grn_id tid; + tid = common_prefix_pat_node_get(ctx, pat, key, prefix_match_size); + if (tid != GRN_ID_NIL) { + id = tid; + } else { + return GRN_END_OF_DATA; } } for (lx = 0; s < e && (len = grn_charlen(ctx, s, e)); s += len) { Modified: test/command/suite/select/function/fuzzy_search/object_literal/prefix_length.expected (+15 -6) =================================================================== --- test/command/suite/select/function/fuzzy_search/object_literal/prefix_length.expected 2016-08-08 22:59:15 +0900 (17ba597) +++ test/command/suite/select/function/fuzzy_search/object_literal/prefix_length.expected 2016-08-14 13:35:53 +0900 (6045607) @@ -10,10 +10,15 @@ load --table Users [ {"name": "Tom"}, {"name": "Tomy"}, -{"name": "Ken"} +{"name": "Tomas"}, +{"name": "Pom"}, +{"name": "Pam"}, +{"name": "Tim"}, +{"name": "Tina"}, +{"name": "Tiga"} ] -[[0,0.0,0.0],3] -select Tags --filter 'fuzzy_search(_key, "To", {"max_distance": 5, "prefix_length": 1})' --output_columns '_key, _score' --match_escalation_threshold -1 +[[0,0.0,0.0],8] +select Tags --filter 'fuzzy_search(_key, "Tom", {"prefix_length": 1})' --output_columns '_key, _score' --match_escalation_threshold -1 [ [ 0, @@ -23,7 +28,7 @@ select Tags --filter 'fuzzy_search(_key, "To", {"max_distance": 5, "prefix_lengt [ [ [ - 2 + 3 ], [ [ @@ -37,11 +42,15 @@ select Tags --filter 'fuzzy_search(_key, "To", {"max_distance": 5, "prefix_lengt ], [ "Tom", - 5 + 2 + ], + [ + "Tim", + 1 ], [ "Tomy", - 4 + 1 ] ] ] Modified: test/command/suite/select/function/fuzzy_search/object_literal/prefix_length.test (+7 -2) =================================================================== --- test/command/suite/select/function/fuzzy_search/object_literal/prefix_length.test 2016-08-08 22:59:15 +0900 (c739a40) +++ test/command/suite/select/function/fuzzy_search/object_literal/prefix_length.test 2016-08-14 13:35:53 +0900 (52614d0) @@ -8,9 +8,14 @@ load --table Users [ {"name": "Tom"}, {"name": "Tomy"}, -{"name": "Ken"} +{"name": "Tomas"}, +{"name": "Pom"}, +{"name": "Pam"}, +{"name": "Tim"}, +{"name": "Tina"}, +{"name": "Tiga"} ] -select Tags --filter 'fuzzy_search(_key, "To", {"max_distance": 5, "prefix_length": 1})' \ +select Tags --filter 'fuzzy_search(_key, "Tom", {"prefix_length": 1})' \ --output_columns '_key, _score' \ --match_escalation_threshold -1 -------------- next part -------------- HTML����������������������������...Download