Merge remote branch 'pietern/networking-perf'

[redis.git] / src / aof.c

diff --git a/src/aof.c b/src/aof.c
index 1ed2363ad8efd9309e3f8a68386fcfb5cec58330..167134818ac3292c8095a205378fa9e15bf110da 100644 (file)
--- a/src/aof.c
+++ b/src/aof.c
@@ -189,6 +189,7 @@ struct redisClient *createFakeClient(void) {
     c->querybuf = sdsempty();
     c->argc = 0;
     c->argv = NULL;
     c->querybuf = sdsempty();
     c->argc = 0;
     c->argv = NULL;

+    c->bufpos = 0;

     c->flags = 0;
     /* We set the fake client as a slave waiting for the synchronization
      * so that Redis will not try to send replies to this client. */
     c->flags = 0;
     /* We set the fake client as a slave waiting for the synchronization
      * so that Redis will not try to send replies to this client. */


@@ -309,7 +310,7 @@ readerr:
     }
     exit(1);
 fmterr:
     }
     exit(1);
 fmterr:

-    redisLog(REDIS_WARNING,"Bad file format reading the append only file");
+    redisLog(REDIS_WARNING,"Bad file format reading the append only file: make a backup of your AOF file, then use ./redis-check-aof --fix <filename>");

     exit(1);
 }
 
     exit(1);
 }
 


@@ -631,12 +632,11 @@ int rewriteAppendOnlyFileBackground(void) {
 
 void bgrewriteaofCommand(redisClient *c) {
     if (server.bgrewritechildpid != -1) {
 
 void bgrewriteaofCommand(redisClient *c) {
     if (server.bgrewritechildpid != -1) {

-        addReplySds(c,sdsnew("-ERR background append only file rewriting already in progress\r\n"));
+        addReplyError(c,"Background append only file rewriting already in progress");

         return;
     }
     if (rewriteAppendOnlyFileBackground() == REDIS_OK) {
         return;
     }
     if (rewriteAppendOnlyFileBackground() == REDIS_OK) {

-        char *status = "+Background append only file rewriting started\r\n";
-        addReplySds(c,sdsnew(status));
+        addReplyStatus(c,"Background append only file rewriting started");

     } else {
         addReply(c,shared.err);
     }
     } else {
         addReply(c,shared.err);
     }