mirror of
https://github.com/fluencelabs/redis
synced 2025-03-20 01:20:50 +00:00
untangle LINSERT and {L,R}PUSHX implementations
This commit is contained in:
parent
550fa7e14f
commit
3e9c20f63b
85
src/t_list.c
85
src/t_list.c
@ -232,68 +232,73 @@ void rpushCommand(client *c) {
|
|||||||
pushGenericCommand(c,LIST_TAIL);
|
pushGenericCommand(c,LIST_TAIL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void pushxGenericCommand(client *c, robj *refval, robj *val, int where) {
|
void pushxGenericCommand(client *c, int where) {
|
||||||
robj *subject;
|
robj *subject;
|
||||||
listTypeIterator *iter;
|
|
||||||
listTypeEntry entry;
|
|
||||||
int inserted = 0;
|
|
||||||
|
|
||||||
if ((subject = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL ||
|
if ((subject = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL ||
|
||||||
checkType(c,subject,OBJ_LIST)) return;
|
checkType(c,subject,OBJ_LIST)) return;
|
||||||
|
|
||||||
if (refval != NULL) {
|
char *event = (where == LIST_HEAD) ? "lpush" : "rpush";
|
||||||
/* Seek refval from head to tail */
|
c->argv[2] = tryObjectEncoding(c->argv[2]);
|
||||||
iter = listTypeInitIterator(subject,0,LIST_TAIL);
|
listTypePush(subject,c->argv[2],where);
|
||||||
while (listTypeNext(iter,&entry)) {
|
signalModifiedKey(c->db,c->argv[1]);
|
||||||
if (listTypeEqual(&entry,refval)) {
|
notifyKeyspaceEvent(NOTIFY_LIST,event,c->argv[1],c->db->id);
|
||||||
listTypeInsert(&entry,val,where);
|
server.dirty++;
|
||||||
inserted = 1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
listTypeReleaseIterator(iter);
|
|
||||||
|
|
||||||
if (inserted) {
|
|
||||||
signalModifiedKey(c->db,c->argv[1]);
|
|
||||||
notifyKeyspaceEvent(NOTIFY_LIST,"linsert",
|
|
||||||
c->argv[1],c->db->id);
|
|
||||||
server.dirty++;
|
|
||||||
} else {
|
|
||||||
/* Notify client of a failed insert */
|
|
||||||
addReply(c,shared.cnegone);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
char *event = (where == LIST_HEAD) ? "lpush" : "rpush";
|
|
||||||
|
|
||||||
listTypePush(subject,val,where);
|
|
||||||
signalModifiedKey(c->db,c->argv[1]);
|
|
||||||
notifyKeyspaceEvent(NOTIFY_LIST,event,c->argv[1],c->db->id);
|
|
||||||
server.dirty++;
|
|
||||||
}
|
|
||||||
|
|
||||||
addReplyLongLong(c,listTypeLength(subject));
|
addReplyLongLong(c,listTypeLength(subject));
|
||||||
}
|
}
|
||||||
|
|
||||||
void lpushxCommand(client *c) {
|
void lpushxCommand(client *c) {
|
||||||
c->argv[2] = tryObjectEncoding(c->argv[2]);
|
pushxGenericCommand(c,LIST_HEAD);
|
||||||
pushxGenericCommand(c,NULL,c->argv[2],LIST_HEAD);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void rpushxCommand(client *c) {
|
void rpushxCommand(client *c) {
|
||||||
c->argv[2] = tryObjectEncoding(c->argv[2]);
|
pushxGenericCommand(c,LIST_TAIL);
|
||||||
pushxGenericCommand(c,NULL,c->argv[2],LIST_TAIL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void linsertCommand(client *c) {
|
void linsertCommand(client *c) {
|
||||||
|
int where;
|
||||||
|
robj *subject;
|
||||||
|
listTypeIterator *iter;
|
||||||
|
listTypeEntry entry;
|
||||||
|
int inserted = 0;
|
||||||
|
|
||||||
c->argv[4] = tryObjectEncoding(c->argv[4]);
|
c->argv[4] = tryObjectEncoding(c->argv[4]);
|
||||||
if (strcasecmp(c->argv[2]->ptr,"after") == 0) {
|
if (strcasecmp(c->argv[2]->ptr,"after") == 0) {
|
||||||
pushxGenericCommand(c,c->argv[3],c->argv[4],LIST_TAIL);
|
where = LIST_TAIL;
|
||||||
} else if (strcasecmp(c->argv[2]->ptr,"before") == 0) {
|
} else if (strcasecmp(c->argv[2]->ptr,"before") == 0) {
|
||||||
pushxGenericCommand(c,c->argv[3],c->argv[4],LIST_HEAD);
|
where = LIST_HEAD;
|
||||||
} else {
|
} else {
|
||||||
addReply(c,shared.syntaxerr);
|
addReply(c,shared.syntaxerr);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((subject = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL ||
|
||||||
|
checkType(c,subject,OBJ_LIST)) return;
|
||||||
|
|
||||||
|
/* Seek pivot from head to tail */
|
||||||
|
iter = listTypeInitIterator(subject,0,LIST_TAIL);
|
||||||
|
while (listTypeNext(iter,&entry)) {
|
||||||
|
if (listTypeEqual(&entry,c->argv[3])) {
|
||||||
|
listTypeInsert(&entry,c->argv[4],where);
|
||||||
|
inserted = 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
listTypeReleaseIterator(iter);
|
||||||
|
|
||||||
|
if (inserted) {
|
||||||
|
signalModifiedKey(c->db,c->argv[1]);
|
||||||
|
notifyKeyspaceEvent(NOTIFY_LIST,"linsert",
|
||||||
|
c->argv[1],c->db->id);
|
||||||
|
server.dirty++;
|
||||||
|
} else {
|
||||||
|
/* Notify client of a failed insert */
|
||||||
|
addReply(c,shared.cnegone);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
addReplyLongLong(c,listTypeLength(subject));
|
||||||
}
|
}
|
||||||
|
|
||||||
void llenCommand(client *c) {
|
void llenCommand(client *c) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user