gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

在处理MAAT组合扫描中最后一个域时，必须之前没有任何分组命中，才能进入快速路径。上一版本存在漏报可能。

Browse Source
This commit is contained in:
zhengchao
2017-06-28 09:51:19 +08:00
parent 255f0392be
commit 07ea788eea
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/entry/Maat_api.cpp
View File

@@ -123,7 +123,7 @@ int region_compile(_Maat_feather_t*feather,struct _INNER_scan_status_t *_mid,int
array_mi_rule[shortcut_avilable_cnt]=(struct _Maat_compile_rule_t*)(group_rule->compile_shortcut); array_mi_rule[shortcut_avilable_cnt]=(struct _Maat_compile_rule_t*)(group_rule->compile_shortcut);
shortcut_avilable_cnt++; shortcut_avilable_cnt++;
} }
_mid->cur_hit_id[_mid->cur_hit_cnt]=(int)group_rule->group_id; _mid->cur_hit_id[_mid->cur_hit_cnt]=group_rule->group_id;
_mid->cur_hit_cnt++; _mid->cur_hit_cnt++;
ret=insert_set_id(&(_mid->hitted_group_id), ret=insert_set_id(&(_mid->hitted_group_id),
&(_mid->hit_group_size), &(_mid->hit_group_size),
@@ -137,10 +137,11 @@ int region_compile(_Maat_feather_t*feather,struct _INNER_scan_status_t *_mid,int
scan_ret=shortcut_avilable_cnt; scan_ret=shortcut_avilable_cnt;
aligment_int64_array_add(feather->orphan_group_saving, thread_num, 1); aligment_int64_array_add(feather->orphan_group_saving, thread_num, 1);
} }
else if(shortcut_avilable_cnt==0&&region_hit_num==1&&is_last_region==1) else if(shortcut_avilable_cnt==0&&region_hit_num==1&&_mid->hit_group_cnt==1&&is_last_region==1)
{ {
//short cut for last scan and combination rules //short cut for last scan and combination rules
//One groups may belong to a statisfy a compile rule, so only region_hit_num=1 could use the short cut //region_hit_num==1 : for current scan hitted rules, one and each other group may statisfy a compile rule.
//_mid->hit_group_cnt==1: With pre scan hitted group rules, one group may staisfy a compile rule
scan_ret=0; scan_ret=0;
aligment_int64_array_add(feather->last_region_saving, thread_num, 1); aligment_int64_array_add(feather->last_region_saving, thread_num, 1);
} }

2
src/entry/Maat_rule.cpp
View File

@@ -28,7 +28,7 @@
#include "mesa_fuzzy.h" #include "mesa_fuzzy.h"
#include "great_index_engine.h" #include "great_index_engine.h"
int MAAT_FRAME_VERSION_1_9_20170624=1; int MAAT_FRAME_VERSION_1_9_20170626=1;
const char *maat_module="MAAT Frame"; const char *maat_module="MAAT Frame";
const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",