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

可以select除表名和表ID。

Browse Source
This commit is contained in:
zhengchao
2018-12-11 19:52:40 +06:00
parent 54778d65a5
commit 12baa32183
4 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/entry/Maat_command.cpp
View File

@@ -1129,9 +1129,11 @@ void _exec_serial_rule(redisContext* ctx, long long version, struct serial_rule_
}
if(s_rule[i].label_id>0)
{
redisAppendCommand(ctx,"ZADD %s NX %d %d",rm_label_sset
,s_rule[i].label_id
,s_rule[i].rule_id);
redisAppendCommand(ctx,"ZADD %s NX %d %s,%d",
rm_label_sset,
s_rule[i].label_id,
s_rule[i].table_name,
s_rule[i].rule_id);
expect_reply[*cnt].srule_seq=i+offset;
expect_reply[*cnt].reply.type=REDIS_REPLY_INTEGER;
expect_reply[*cnt].reply.integer=1;
@@ -2400,26 +2402,64 @@ long long Maat_cmd_incrby(Maat_feather_t feather,const char* key, int increment)
}
freeReplyObject(data_reply);
return result;
}
}
void Maat_cmd_key_free(struct Maat_cmd_key**keys, int size)
{
int i=0;
struct Maat_cmd_key* p=*keys;
for(i=0; i<size; i++)
{
free(p->table_name);
p->table_name=NULL;
p->rule_id=0;
}
free(p);
*keys=NULL;
return;
}
int Maat_cmd_key_select(Maat_feather_t feather, int label_id, struct Maat_cmd_key** keys)
{
_Maat_feather_t* _feather=(_Maat_feather_t*)feather;
redisReply* data_reply=NULL;
char* tmp=NULL;
unsigned int i=0;
struct Maat_cmd_key* result=NULL;
int result_cnt=0;
redisContext* write_ctx=get_redis_ctx_for_write(_feather);
if(write_ctx==NULL)
{
return -1;
}
data_reply=_wrap_redisCommand(write_ctx,"ZRANGEBYSCORE %s %d %d"
,rm_label_sset
,label_id
,label_id);
data_reply=_wrap_redisCommand(write_ctx,"ZRANGEBYSCORE %s %d %d",
rm_label_sset,
label_id,
label_id);
result_cnt=data_reply->elements;
result=ALLOC(struct Maat_cmd_key, data_reply->elements);
for(i=0;i<data_reply->elements;i++)
{
{
result[i].table_name=_maat_strdup(data_reply->element[i]->str);
tmp=strchr(result[i].table_name, ',');
*tmp='\0';
tmp++;
result[i].rule_id=atoi(tmp);
}
freeReplyObject(data_reply);
*keys=result;
return result_cnt;
}
int Maat_cmd_select(Maat_feather_t feather, int label_id, int * output_ids, unsigned int size)
{
struct Maat_cmd_key* keys=NULL;
int result_cnt=0, i=0;
result_cnt=Maat_cmd_key_select(feather, label_id, &keys);
for(i=0; i<result_cnt && i<(int)size; i++)
{
output_ids[i]=keys[i].rule_id;
}
Maat_cmd_key_free(&keys, result_cnt);
return i;
}