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

修复bug，删除分组内最后一条域配置和该组配置时，将group_rule两次放入垃圾回收队列，导致段错误。

Browse Source
This commit is contained in:
zhengchao
2016-11-21 15:28:49 +08:00
parent 7fd59cad78
commit 303a161d6d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/entry/Maat_rule.cpp
View File

@@ -26,7 +26,7 @@
#include "mesa_fuzzy.h" #include "mesa_fuzzy.h"
#include "great_index_engine.h" #include "great_index_engine.h"
int MAAT_FRAME_VERSION_1_8_20161116=1; int MAAT_FRAME_VERSION_1_8_20161121=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",
@@ -1781,7 +1781,7 @@ int del_region_rule(struct _Maat_table_info_t* table,int region_id,int group_id,
HASH_delete_by_id(maat_scanner->group_hash,group_id); HASH_delete_by_id(maat_scanner->group_hash,group_id);
garbage_bagging(GARBAGE_GROUP_RULE, group_rule, maat_scanner->tomb_ref); garbage_bagging(GARBAGE_GROUP_RULE, group_rule, maat_scanner->tomb_ref);
MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_module , MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_module ,
"last region rule of group id %d in table %s region id %d has been delete." "Indirectly delete group %d,last region rule has been delete,table %s region id %d ."
,group_id ,group_id
,table->table_name[table->updating_name] ,table->table_name[table->updating_name]
,region_id); ,region_id);
@@ -1849,12 +1849,11 @@ void del_group_rule(struct _Maat_table_info_t* table,struct db_group_rule_t* db_
HASH_delete_by_id(scanner->compile_hash, db_group_rule->compile_id); HASH_delete_by_id(scanner->compile_hash, db_group_rule->compile_id);
garbage_bagging(GARBAGE_COMPILE_RULE, compile_rule, scanner->tomb_ref); garbage_bagging(GARBAGE_COMPILE_RULE, compile_rule, scanner->tomb_ref);
} }
//Directly delete group id will not destroyp group_rule,it 'll be destroyed when delete this group's last region.
if(group_rule->ref_cnt==0&&group_rule->region_cnt==0) if(group_rule->ref_cnt==0&&group_rule->region_cnt==0)
{ {
HASH_delete_by_id(scanner->group_hash,db_group_rule->group_id);
garbage_bagging(GARBAGE_GROUP_RULE, group_rule, scanner->tomb_ref);
MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_module , MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_module ,
"table %s group id %d been eternal delete." "Directly delete table %s group id %d, do this when delete its last region."
,table->table_name[table->updating_name] ,table->table_name[table->updating_name]
,db_group_rule->group_id); ,db_group_rule->group_id);
} }