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

Don't build a reply when replaying the AOF

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-08-30 16:51:39 +02:00
parent b301c1fc2b
commit 57b0738011
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/aof.c
View File

@ -272,12 +272,14 @@ int loadAppendOnlyFile(char *filename) {
fakeClient->argc = argc; fakeClient->argc = argc;
fakeClient->argv = argv; fakeClient->argv = argv;
cmd->proc(fakeClient); cmd->proc(fakeClient);
/* Discard the reply objects list from the fake client */
while(listLength(fakeClient->reply)) /* The fake client should not have a reply */
listDelNode(fakeClient->reply,listFirst(fakeClient->reply)); redisAssert(fakeClient->bufpos == 0 && listLength(fakeClient->reply) == 0);
/* Clean up, ready for the next command */ /* Clean up, ready for the next command */
for (j = 0; j < argc; j++) decrRefCount(argv[j]); for (j = 0; j < argc; j++) decrRefCount(argv[j]);
zfree(argv); zfree(argv);
/* Handle swapping while loading big datasets when VM is on */ /* Handle swapping while loading big datasets when VM is on */
force_swapout = 0; force_swapout = 0;
if ((zmalloc_used_memory() - server.vm_max_memory) > 1024*1024*32) if ((zmalloc_used_memory() - server.vm_max_memory) > 1024*1024*32)

1
src/networking.c
View File

@ -62,6 +62,7 @@ redisClient *createClient(int fd) {
} }
int _ensureFileEvent(redisClient *c) { int _ensureFileEvent(redisClient *c) {
if (c->fd <= 0) return REDIS_ERR;
if (c->bufpos == 0 && listLength(c->reply) == 0 && if (c->bufpos == 0 && listLength(c->reply) == 0 &&
(c->replstate == REDIS_REPL_NONE || (c->replstate == REDIS_REPL_NONE ||
c->replstate == REDIS_REPL_ONLINE) && c->replstate == REDIS_REPL_ONLINE) &&