From eeb5fa279f3469cc2bfd2d25465a652e1bc85b60 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Tue, 20 Nov 2018 20:43:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8renew=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=AE=BE=E7=BD=AE=E8=B6=85=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=87=8D=E5=A4=8D=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84Maat=5Fset=5Flines=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E4=B8=8D=E5=86=8Dassert=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_command.cpp | 6 ++---- src/entry/Maat_rule.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp index a88ad66..0827b9d 100644 --- a/src/entry/Maat_command.cpp +++ b/src/entry/Maat_command.cpp @@ -1181,8 +1181,7 @@ void _exec_serial_rule(redisContext* ctx, long long version, struct serial_rule_ continue; } //s_rule[i].timeout>0 was checked by caller. - //XX: Only update elements that already exist. Never add elements. - redisAppendCommand(ctx,"ZADD %s XX %lld %s,%d",rm_expire_sset + redisAppendCommand(ctx,"ZADD %s %lld %s,%d",rm_expire_sset ,s_rule[i].timeout ,s_rule[i].table_name ,s_rule[i].rule_id); @@ -2074,12 +2073,11 @@ int Maat_cmd_set_lines(Maat_feather_t feather,const struct Maat_line_t** line_ru set_serial_rule(s_rule+i, op,line_rule[i]->rule_id,line_rule[i]->label_id,line_rule[i]->table_name,line_rule[i]->table_line, absolute_expire_time); } success_cnt=exec_serial_rule(_feather->redis_write_ctx,s_rule, line_num,server_time,_feather->logger); - if(success_cnt<0)//error + if(success_cnt<0||success_cnt!=line_num)//error { ret=-1; goto error_out; } - assert(success_cnt==line_num); ret=success_cnt; _feather->line_cmd_acc_num+=success_cnt; diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index e847a8a..4e3477d 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -32,7 +32,7 @@ #include "stream_fuzzy_hash.h" #include "gram_index_engine.h" -int MAAT_FRAME_VERSION_2_4_20181115=1; +int MAAT_FRAME_VERSION_2_4_20181120=1; const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", "unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""};