naoa
null+****@clear*****
Tue Feb 9 05:22:05 JST 2016
naoa 2016-02-09 05:22:05 +0900 (Tue, 09 Feb 2016) New Revision: d80d1af24a0f26aac77babea90fced28c82b6a9c https://github.com/groonga/groonga/commit/d80d1af24a0f26aac77babea90fced28c82b6a9c Merged 4c77404: Merge pull request #474 from naoa/fix-fuzzy-weight Message: Update test Added files: test/command/suite/select/function/fuzzy_search/index/vector.test Copied files: test/command/suite/select/function/fuzzy_search/index/vector.expected (from test/command/suite/select/function/fuzzy_search/index/index.expected) Modified files: test/command/suite/select/function/fuzzy_search/index/index.expected test/command/suite/select/function/fuzzy_search/index/index.test test/command/suite/select/function/fuzzy_search/index/index_with_tokenizer.expected test/command/suite/select/function/fuzzy_search/index/index_with_tokenizer.test Modified: test/command/suite/select/function/fuzzy_search/index/index.expected (+8 -3) =================================================================== --- test/command/suite/select/function/fuzzy_search/index/index.expected 2016-02-09 05:14:55 +0900 (aa709fd) +++ test/command/suite/select/function/fuzzy_search/index/index.expected 2016-02-09 05:22:05 +0900 (05d7426) @@ -10,9 +10,10 @@ load --table Users [ {"name": "Tom"}, {"name": "Tomy"}, -{"name": "Ken"} +{"name": "Ken"}, +{"name": "Tom"} ] -[[0,0.0,0.0],3] +[[0,0.0,0.0],4] select Users --filter 'fuzzy_search(name, "Tom", 1)' --output_columns 'name, _score' --match_escalation_threshold -1 [ [ @@ -23,7 +24,7 @@ select Users --filter 'fuzzy_search(name, "Tom", 1)' --output_columns 'name, _ [ [ [ - 2 + 3 ], [ [ @@ -42,6 +43,10 @@ select Users --filter 'fuzzy_search(name, "Tom", 1)' --output_columns 'name, _ [ "Tomy", 1 + ], + [ + "Tom", + 2 ] ] ] Modified: test/command/suite/select/function/fuzzy_search/index/index.test (+2 -1) =================================================================== --- test/command/suite/select/function/fuzzy_search/index/index.test 2016-02-09 05:14:55 +0900 (00142f4) +++ test/command/suite/select/function/fuzzy_search/index/index.test 2016-02-09 05:22:05 +0900 (ee0b845) @@ -8,7 +8,8 @@ load --table Users [ {"name": "Tom"}, {"name": "Tomy"}, -{"name": "Ken"} +{"name": "Ken"}, +{"name": "Tom"} ] select Users --filter 'fuzzy_search(name, "Tom", 1)' \ Modified: test/command/suite/select/function/fuzzy_search/index/index_with_tokenizer.expected (+8 -3) =================================================================== --- test/command/suite/select/function/fuzzy_search/index/index_with_tokenizer.expected 2016-02-09 05:14:55 +0900 (5700d51) +++ test/command/suite/select/function/fuzzy_search/index/index_with_tokenizer.expected 2016-02-09 05:22:05 +0900 (f069a99) @@ -10,9 +10,10 @@ load --table Users [ {"name": "Tom Yamada"}, {"name": "Tomy Yamada"}, -{"name": "Ken Yamada"} +{"name": "Ken Yamada"}, +{"name": "Tom Yamad"} ] -[[0,0.0,0.0],3] +[[0,0.0,0.0],4] select Users --filter 'fuzzy_search(name, "Tom Yamad", 1)' --output_columns 'name, _score' --match_escalation_threshold -1 [ [ @@ -23,7 +24,7 @@ select Users --filter 'fuzzy_search(name, "Tom Yamad", 1)' --output_columns 'n [ [ [ - 2 + 3 ], [ [ @@ -42,6 +43,10 @@ select Users --filter 'fuzzy_search(name, "Tom Yamad", 1)' --output_columns 'n [ "Tomy Yamada", 1 + ], + [ + "Tom Yamad", + 3 ] ] ] Modified: test/command/suite/select/function/fuzzy_search/index/index_with_tokenizer.test (+2 -1) =================================================================== --- test/command/suite/select/function/fuzzy_search/index/index_with_tokenizer.test 2016-02-09 05:14:55 +0900 (009761f) +++ test/command/suite/select/function/fuzzy_search/index/index_with_tokenizer.test 2016-02-09 05:22:05 +0900 (431438b) @@ -8,7 +8,8 @@ load --table Users [ {"name": "Tom Yamada"}, {"name": "Tomy Yamada"}, -{"name": "Ken Yamada"} +{"name": "Ken Yamada"}, +{"name": "Tom Yamad"} ] select Users --filter 'fuzzy_search(name, "Tom Yamad", 1)' \ Copied: test/command/suite/select/function/fuzzy_search/index/vector.expected (+32 -10) 50% =================================================================== --- test/command/suite/select/function/fuzzy_search/index/index.expected 2016-02-09 05:14:55 +0900 (aa709fd) +++ test/command/suite/select/function/fuzzy_search/index/vector.expected 2016-02-09 05:22:05 +0900 (d9cc0ca) @@ -1,6 +1,6 @@ table_create Users TABLE_NO_KEY [[0,0.0,0.0],true] -column_create Users name COLUMN_SCALAR ShortText +column_create Users name COLUMN_VECTOR ShortText [[0,0.0,0.0],true] table_create Tags TABLE_PAT_KEY ShortText [[0,0.0,0.0],true] @@ -8,12 +8,14 @@ column_create Tags tag COLUMN_INDEX Users name [[0,0.0,0.0],true] load --table Users [ -{"name": "Tom"}, -{"name": "Tomy"}, -{"name": "Ken"} +{"name": ["Tom", "Tomy"]}, +{"name": ["Tomy", "Tom"]}, +{"name": ["Tomy", "Ken"]}, +{"name": ["Tom", "Ken"]}, +{"name": ["Ken"]} ] -[[0,0.0,0.0],3] -select Users --filter 'fuzzy_search(name, "Tom", 1)' --output_columns 'name, _score' --match_escalation_threshold -1 +[[0,0.0,0.0],5] +select Users --filter 'fuzzy_search(name, "Tom", 2)' --output_columns 'name, _score' --match_escalation_threshold -1 [ [ 0, @@ -23,7 +25,7 @@ select Users --filter 'fuzzy_search(name, "Tom", 1)' --output_columns 'name, _ [ [ [ - 2 + 4 ], [ [ @@ -36,12 +38,32 @@ select Users --filter 'fuzzy_search(name, "Tom", 1)' --output_columns 'name, _ ] ], [ - "Tom", + [ + "Tom", + "Tomy" + ], + 2 + ], + [ + [ + "Tomy", + "Tom" + ], + 3 + ], + [ + [ + "Tomy", + "Ken" + ], 2 ], [ - "Tomy", - 1 + [ + "Tom", + "Ken" + ], + 3 ] ] ] Added: test/command/suite/select/function/fuzzy_search/index/vector.test (+18 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/function/fuzzy_search/index/vector.test 2016-02-09 05:22:05 +0900 (e9b6ecd) @@ -0,0 +1,18 @@ +table_create Users TABLE_NO_KEY +column_create Users name COLUMN_VECTOR ShortText + +table_create Tags TABLE_PAT_KEY ShortText +column_create Tags tag COLUMN_INDEX Users name + +load --table Users +[ +{"name": ["Tom", "Tomy"]}, +{"name": ["Tomy", "Tom"]}, +{"name": ["Tomy", "Ken"]}, +{"name": ["Tom", "Ken"]}, +{"name": ["Ken"]} +] + +select Users --filter 'fuzzy_search(name, "Tom", 2)' \ + --output_columns 'name, _score' \ + --match_escalation_threshold -1 -------------- next part -------------- HTML����������������������������...Download