From 303a161d6d5c397a7e60457569bff8f2c288feb0 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Mon, 21 Nov 2016 15:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=88=86=E7=BB=84=E5=86=85=E6=9C=80=E5=90=8E=E4=B8=80?= =?UTF-8?q?=E6=9D=A1=E5=9F=9F=E9=85=8D=E7=BD=AE=E5=92=8C=E8=AF=A5=E7=BB=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8C=E5=B0=86group=5Frule?= =?UTF-8?q?=E4=B8=A4=E6=AC=A1=E6=94=BE=E5=85=A5=E5=9E=83=E5=9C=BE=E5=9B=9E?= =?UTF-8?q?=E6=94=B6=E9=98=9F=E5=88=97=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=AE=B5?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_rule.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 5d790c0..66d0cf0 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -26,7 +26,7 @@ #include "mesa_fuzzy.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* 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); garbage_bagging(GARBAGE_GROUP_RULE, group_rule, maat_scanner->tomb_ref); 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 ,table->table_name[table->updating_name] ,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); 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) { - 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 , - "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] ,db_group_rule->group_id); }