fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-20 20:46:31 +00:00
Code Issues Projects Releases Wiki Activity

Better system for additional commands replication.

Browse Source 
The new code uses a more generic data structure to describe redis operations.
The new design allows for multiple alsoPropagate() calls within the scope of a
single command, that is useful in different contexts. For instance there
when there are multiple clients doing BRPOPLPUSH against the same list,
and a variadic LPUSH is performed against this list, the blocked clients
will both be served, and we should correctly replicate multiple LPUSH
commands after the replication of the current command.
This commit is contained in:
antirez
2012-02-29 00:46:50 +01:00
parent eeb34eff52
commit 78d6a22dc3
2 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/redis.c
View File

@ -1161,6 +1161,43 @@ void resetCommandTableStats(void) {
}
}
/* ========================== Redis OP Array API ============================ */
void redisOpArrayInit(redisOpArray *oa) {
oa->ops = NULL;
oa->numops = 0;
}
int redisOpArrayAppend(redisOpArray *oa, struct redisCommand *cmd, int dbid,
robj **argv, int argc, int target)
{
redisOp *op;
oa->ops = zrealloc(oa->ops,sizeof(redisOp)*(oa->numops+1));
op = oa->ops+oa->numops;
op->cmd = cmd;
op->dbid = dbid;
op->argv = argv;
op->argc = argc;
op->target = target;
oa->numops++;
return oa->numops;
}
void redisOpArrayFree(redisOpArray *oa) {
while(oa->numops) {
int j;
redisOp *op;
oa->numops--;
op = oa->ops+oa->numops;
for (j = 0; j < op->argc; j++)
decrRefCount(op->argv[j]);
zfree(op->argv);
}
zfree(oa->ops);
}
/* ====================== Commands lookup and execution ===================== */
struct redisCommand *lookupCommand(sds name) {
@ -1193,18 +1230,12 @@ void propagate(struct redisCommand *cmd, int dbid, robj **argv, int argc,
replicationFeedSlaves(server.slaves,dbid,argv,argc);
}
/* Used inside commands to propatate an additional command if needed. */
/* Used inside commands to schedule the propagation of additional commands
* after the current command is propagated to AOF / Replication. */
void alsoPropagate(struct redisCommand *cmd, int dbid, robj **argv, int argc,
int target)
{
propagatedItem *pi = &server.also_propagate;
redisAssert(pi->target == REDIS_PROPAGATE_NONE);
pi->cmd = cmd;
pi->dbid = dbid;
pi->argv = argv;
pi->argc = argc;
pi->target = target;
redisOpArrayAppend(&server.also_propagate,cmd,dbid,argv,argc,target);
}
/* Call() is the core of Redis execution of a command */
@ -1217,7 +1248,7 @@ void call(redisClient *c, int flags) {
replicationFeedMonitors(server.monitors,c->db->id,c->argv,c->argc);
/* Call the command. */
server.also_propagate.target = REDIS_PROPAGATE_NONE;
redisOpArrayInit(&server.also_propagate);
dirty = server.dirty;
c->cmd->proc(c);
dirty = server.dirty-dirty;
@ -1250,13 +1281,15 @@ void call(redisClient *c, int flags) {
}
/* Commands such as LPUSH or BRPOPLPUSH may propagate an additional
* PUSH command. */
if (server.also_propagate.target != REDIS_PROPAGATE_NONE) {
if (server.also_propagate.numops) {
int j;
propagatedItem *pi = &server.also_propagate;
redisOp *rop;
propagate(pi->cmd, pi->dbid, pi->argv, pi->argc, pi->target);
for (j = 0; j < pi->argc; j++) decrRefCount(pi->argv[j]);
zfree(pi->argv);
for (j = 0; j < server.also_propagate.numops; j++) {
rop = &server.also_propagate.ops[j];
propagate(rop->cmd, rop->dbid, rop->argv, rop->argc, rop->target);
}
redisOpArrayFree(&server.also_propagate);
}
server.stat_numcommands++;
}