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

增加IRIS增量目录和全量目录都部为空的判断，避免直接段错误。

Browse Source
This commit is contained in:
zhengchao
2016-01-26 08:54:15 +08:00
parent 57dd773c71
commit 125a2e3cb3
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
readme.txt
View File

@@ -41,4 +41,5 @@ indexfile;
2015-07-06 1)handle wrong expr format like "aa&&bb" and "aa&bb&"; 2015-07-06 1)handle wrong expr format like "aa&&bb" and "aa&bb&";
2)iconv_convert performance optimized; 2)iconv_convert performance optimized;
2015-10-19 check table_type in callback register; 2015-10-19 check table_type in callback register;
2015-12-24 change plugin table update mechanism to save memory; 2015-12-24 change plugin table update mechanism to save memory;
2016-01-20 maat_finish_cb adapt empty inc callback on a NULL scanner;

6
src/entry/Maat_rule.cpp
View File

@@ -24,7 +24,7 @@
#include "mesa_fuzzy.h" #include "mesa_fuzzy.h"
#include "great_index_engine.h" #include "great_index_engine.h"
int MAAT_FRAME_VERSION_1_3_20151224=1; int MAAT_FRAME_VERSION_1_3_20160120=1;
const char *maat_module="MAAT Frame"; const char *maat_module="MAAT Frame";
const char* CHARSET_STRING[]={"CHARSET_NONE","GBK","BIG5","UNICODE","UTF-8"}; const char* CHARSET_STRING[]={"CHARSET_NONE","GBK","BIG5","UNICODE","UTF-8"};
@@ -2258,7 +2258,7 @@ void maat_finish_cb(void* u_para)
"Full config version %u load %d entries complete.", "Full config version %u load %d entries complete.",
feather->update_tmp_scanner->version,feather->update_tmp_scanner->cfg_num); feather->update_tmp_scanner->version,feather->update_tmp_scanner->cfg_num);
} }
else else if(feather->scanner!=NULL)
{ {
feather->scanner->cfg_num=total; feather->scanner->cfg_num=total;
feather->scanner->version=feather->maat_version; feather->scanner->version=feather->maat_version;
@@ -2275,7 +2275,7 @@ void maat_finish_cb(void* u_para)
else else
{ {
MESA_handle_runtime_log(feather->logger,RLOG_LV_INFO,maat_module, MESA_handle_runtime_log(feather->logger,RLOG_LV_INFO,maat_module,
"Postpone config version %u %d entries load to rulescan.", "Postpone config version %u (%d entries) load to rulescan.",
feather->scanner->version,feather->scanner->cfg_num); feather->scanner->version,feather->scanner->cfg_num);
} }
} }