Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
fixed #8 broken CALL KEYWORDS to distributed index via API or to remo…
…te agent; added regressions to test 365
- Loading branch information
Showing
with
116 additions
and 85 deletions.
- +92 −81 src/searchd.cpp
- +1 −1 test/test_365/model.bin
- +23 −3 test/test_365/test.xml
@@ -1 +1 @@ | ||
a:1:{i:0;a:6:{i:0;a:2:{s:8:"sphinxql";s:118:"INSERT INTO rt_bi (id, gid, title) VALUES ( 1, 1, 'manticore search is the best'), (2, 2, 'manticore is more better' )";s:14:"total_affected";i:2;}i:1;a:3:{s:8:"sphinxql";s:69:"CALL KEYWORDS ( 'manti*', 'idx_bi', 1 AS stats, 0 AS fold_wildcards )";s:10:"total_rows";i:4;s:4:"rows";a:4:{i:0;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:9:"manticore";s:4:"docs";s:1:"3";s:4:"hits";s:1:"3";}i:1;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:12:"manticore is";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:2;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:14:"manticore like";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:3;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:16:"manticore search";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}i:2;a:3:{s:8:"sphinxql";s:68:"CALL KEYWORDS ( 'manti*', 'rt_bi', 1 AS stats, 0 AS fold_wildcards )";s:10:"total_rows";i:3;s:4:"rows";a:3:{i:0;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:16:"manticore search";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:1;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:9:"manticore";s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}i:2;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:12:"manticore is";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}i:3;a:2:{s:8:"sphinxql";s:20:"FLUSH RAMCHUNK rt_bi";s:14:"total_affected";i:0;}i:4;a:2:{s:8:"sphinxql";s:84:"INSERT INTO rt_bi (id, gid, title) VALUES (3, 3, 'search with manticore like many' )";s:14:"total_affected";i:1;}i:5;a:3:{s:8:"sphinxql";s:68:"CALL KEYWORDS ( 'manti*', 'rt_bi', 1 AS stats, 0 AS fold_wildcards )";s:10:"total_rows";i:4;s:4:"rows";a:4:{i:0;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:14:"manticore like";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:1;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:16:"manticore search";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:2;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:12:"manticore is";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:3;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:9:"manticore";s:4:"docs";s:1:"3";s:4:"hits";s:1:"3";}}}}} | ||
a:1:{i:0;a:8:{i:0;a:2:{s:8:"sphinxql";s:118:"INSERT INTO rt_bi (id, gid, title) VALUES ( 1, 1, 'manticore search is the best'), (2, 2, 'manticore is more better' )";s:14:"total_affected";i:2;}i:1;a:3:{s:8:"sphinxql";s:90:"CALL KEYWORDS ( 'manti*', 'idx_bi', 1 AS stats, 0 AS fold_wildcards, 'hits' as sort_mode )";s:10:"total_rows";i:4;s:4:"rows";a:4:{i:0;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:9:"manticore";s:4:"docs";s:1:"3";s:4:"hits";s:1:"3";}i:1;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:12:"manticore is";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:2;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:14:"manticore like";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:3;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:16:"manticore search";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}i:2;a:3:{s:8:"sphinxql";s:89:"CALL KEYWORDS ( 'manti*', 'rt_bi', 1 AS stats, 0 AS fold_wildcards, 'hits' as sort_mode )";s:10:"total_rows";i:3;s:4:"rows";a:3:{i:0;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:9:"manticore";s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}i:1;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:12:"manticore is";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:2;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:16:"manticore search";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}i:3;a:2:{s:8:"sphinxql";s:20:"FLUSH RAMCHUNK rt_bi";s:14:"total_affected";i:0;}i:4;a:2:{s:8:"sphinxql";s:84:"INSERT INTO rt_bi (id, gid, title) VALUES (3, 3, 'search with manticore like many' )";s:14:"total_affected";i:1;}i:5;a:3:{s:8:"sphinxql";s:89:"CALL KEYWORDS ( 'manti*', 'rt_bi', 1 AS stats, 0 AS fold_wildcards, 'hits' as sort_mode )";s:10:"total_rows";i:4;s:4:"rows";a:4:{i:0;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:9:"manticore";s:4:"docs";s:1:"3";s:4:"hits";s:1:"3";}i:1;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:12:"manticore is";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:2;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:14:"manticore like";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}i:3;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:16:"manticore search";s:4:"docs";s:1:"1";s:4:"hits";s:1:"1";}}}i:6;a:3:{s:8:"sphinxql";s:94:"CALL KEYWORDS ( 'manti*', 'dist_local', 1 AS stats, 0 AS fold_wildcards, 'hits' as sort_mode )";s:10:"total_rows";i:4;s:4:"rows";a:4:{i:0;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:9:"manticore";s:4:"docs";s:1:"6";s:4:"hits";s:1:"6";}i:1;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:12:"manticore is";s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}i:2;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:14:"manticore like";s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}i:3;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:16:"manticore search";s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}}}i:7;a:3:{s:8:"sphinxql";s:95:"CALL KEYWORDS ( 'manti*', 'dist_remote', 1 AS stats, 0 AS fold_wildcards, 'hits' as sort_mode )";s:10:"total_rows";i:4;s:4:"rows";a:4:{i:0;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:9:"manticore";s:4:"docs";s:1:"6";s:4:"hits";s:1:"6";}i:1;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:12:"manticore is";s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}i:2;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:14:"manticore like";s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}i:3;a:5:{s:4:"qpos";s:1:"1";s:9:"tokenized";s:6:"manti*";s:10:"normalized";s:16:"manticore search";s:4:"docs";s:1:"2";s:4:"hits";s:1:"2";}}}}} |