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

对于Append命令，redisGetReply需要多次调用。

Browse Source
This commit is contained in:
zhengchao
2017-07-05 09:36:29 +08:00
parent 484421c8cf
commit eb672ee77e
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/entry/Maat_command.cpp
View File

@@ -791,7 +791,7 @@ int Maat_commit_command(Maat_feather_t feather)
{ {
_Maat_feather_t* _feather=(_Maat_feather_t*)feather; _Maat_feather_t* _feather=(_Maat_feather_t*)feather;
int ret=0,i=0,retry=0; int ret=0,i=0,retry=0,append_cmd_cnt=0;
long long maat_redis_version=0; long long maat_redis_version=0;
int new_region_num=0,new_group_num=0; int new_region_num=0,new_group_num=0;
int serial_rule_num=0,serial_rule_idx=0; int serial_rule_num=0,serial_rule_idx=0;
@@ -859,11 +859,12 @@ int Maat_commit_command(Maat_feather_t feather)
,s_rule[i].table_name ,s_rule[i].table_name
,s_rule[i].rule_id ,s_rule[i].rule_id
,s_rule[i].table_line); ,s_rule[i].table_line);
append_cmd_cnt++;
//NX: Don't update already exisiting elements. Always add new elements. //NX: Don't update already exisiting elements. Always add new elements.
redisAppendCommand(ctx,"ZADD NX ADD,%s,%d %d",s_rule[i].table_name redisAppendCommand(ctx,"ZADD NX ADD,%s,%d %d",s_rule[i].table_name
,s_rule[i].rule_id ,s_rule[i].rule_id
,maat_redis_version); ,maat_redis_version);
append_cmd_cnt++;
} }
else else
{ {
@@ -876,20 +877,25 @@ int Maat_commit_command(Maat_feather_t feather)
,s_rule[i].table_name ,s_rule[i].table_name
,s_rule[i].rule_id ,s_rule[i].rule_id
); );
append_cmd_cnt++;
redisAppendCommand(ctx,"EXPIRE %s:%s,%d %d",rm_key_prefix[MAAT_OP_DEL] redisAppendCommand(ctx,"EXPIRE %s:%s,%d %d",rm_key_prefix[MAAT_OP_DEL]
,s_rule[i].table_name ,s_rule[i].table_name
,s_rule[i].rule_id ,s_rule[i].rule_id
,MAAT_REDIS_SYNC_TIME); ,MAAT_REDIS_SYNC_TIME);
append_cmd_cnt++;
//NX: Don't update already exisiting elements. Always add new elements. //NX: Don't update already exisiting elements. Always add new elements.
redisAppendCommand(ctx,"ZADD NX DEL,%s,%d %d",s_rule[i].table_name redisAppendCommand(ctx,"ZADD NX DEL,%s,%d %d",s_rule[i].table_name
,s_rule[i].rule_id ,s_rule[i].rule_id
,maat_redis_version); ,maat_redis_version);
append_cmd_cnt++;
} }
} }
redisAppendCommand(ctx,"INCRBY MAAT_VERSION 1"); redisAppendCommand(ctx,"INCRBY MAAT_VERSION 1");
append_cmd_cnt++;
redisAppendCommand(ctx,"EXEC"); redisAppendCommand(ctx,"EXEC");
append_cmd_cnt++;
for(i=0;i<append_cmd_cnt;i++)
{
_wrap_redisGetReply(ctx, &data_reply); _wrap_redisGetReply(ctx, &data_reply);
if(1==mr_transaction_success(data_reply)) if(1==mr_transaction_success(data_reply))
{ {
@@ -903,6 +909,7 @@ int Maat_commit_command(Maat_feather_t feather)
freeReplyObject(data_reply); freeReplyObject(data_reply);
} }
} }
}
_feather->cmd_acc_num+=_feather->cmd_q_cnt; _feather->cmd_acc_num+=_feather->cmd_q_cnt;
error_out: error_out:
p=_feather->cmd_qhead; p=_feather->cmd_qhead;