A define to make Redis more helgrind friendly

[redis.git] / redis-cli.c

diff --git a/redis-cli.c b/redis-cli.c
index cc218a555635430203244b34bc9d7fd034e2a49b..a082a9bb9b22d042a02ba297b5534e1877f1b91d 100644 (file)
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -42,7 +42,7 @@
 
 #define REDIS_CMD_INLINE 1
 #define REDIS_CMD_BULK 2
 
 #define REDIS_CMD_INLINE 1
 #define REDIS_CMD_BULK 2

-#define REDIS_CMD_MULTIBULK 3
+#define REDIS_CMD_MULTIBULK 4

 
 #define REDIS_NOTUSED(V) ((void) V)
 
 
 #define REDIS_NOTUSED(V) ((void) V)
 


@@ -50,6 +50,7 @@ static struct config {
     char *hostip;
     int hostport;
     long repeat;
     char *hostip;
     int hostport;
     long repeat;

+    int dbnum;

 } config;
 
 struct redisCommand {
 } config;
 
 struct redisCommand {


@@ -70,6 +71,8 @@ static struct redisCommand cmdTable[] = {
     {"lpush",3,REDIS_CMD_BULK},
     {"rpop",2,REDIS_CMD_INLINE},
     {"lpop",2,REDIS_CMD_INLINE},
     {"lpush",3,REDIS_CMD_BULK},
     {"rpop",2,REDIS_CMD_INLINE},
     {"lpop",2,REDIS_CMD_INLINE},

+    {"brpop",-3,REDIS_CMD_INLINE},
+    {"blpop",-3,REDIS_CMD_INLINE},

     {"llen",2,REDIS_CMD_INLINE},
     {"lindex",3,REDIS_CMD_INLINE},
     {"lset",4,REDIS_CMD_BULK},
     {"llen",2,REDIS_CMD_INLINE},
     {"lindex",3,REDIS_CMD_INLINE},
     {"lset",4,REDIS_CMD_BULK},


@@ -92,11 +95,12 @@ static struct redisCommand cmdTable[] = {
     {"sdiffstore",-3,REDIS_CMD_INLINE},
     {"smembers",2,REDIS_CMD_INLINE},
     {"zadd",4,REDIS_CMD_BULK},
     {"sdiffstore",-3,REDIS_CMD_INLINE},
     {"smembers",2,REDIS_CMD_INLINE},
     {"zadd",4,REDIS_CMD_BULK},

+    {"zincrby",4,REDIS_CMD_BULK},

     {"zrem",3,REDIS_CMD_BULK},
     {"zremrangebyscore",4,REDIS_CMD_INLINE},
     {"zrem",3,REDIS_CMD_BULK},
     {"zremrangebyscore",4,REDIS_CMD_INLINE},

-    {"zrange",4,REDIS_CMD_INLINE},
-    {"zrangebyscore",4,REDIS_CMD_INLINE},
-    {"zrevrange",4,REDIS_CMD_INLINE},
+    {"zrange",-4,REDIS_CMD_INLINE},
+    {"zrangebyscore",-4,REDIS_CMD_INLINE},
+    {"zrevrange",-4,REDIS_CMD_INLINE},

     {"zcard",2,REDIS_CMD_INLINE},
     {"zscore",3,REDIS_CMD_BULK},
     {"incrby",3,REDIS_CMD_INLINE},
     {"zcard",2,REDIS_CMD_INLINE},
     {"zscore",3,REDIS_CMD_BULK},
     {"incrby",3,REDIS_CMD_INLINE},


@@ -113,6 +117,8 @@ static struct redisCommand cmdTable[] = {
     {"echo",2,REDIS_CMD_BULK},
     {"save",1,REDIS_CMD_INLINE},
     {"bgsave",1,REDIS_CMD_INLINE},
     {"echo",2,REDIS_CMD_BULK},
     {"save",1,REDIS_CMD_INLINE},
     {"bgsave",1,REDIS_CMD_INLINE},

+    {"rewriteaof",1,REDIS_CMD_INLINE},
+    {"bgrewriteaof",1,REDIS_CMD_INLINE},

     {"shutdown",1,REDIS_CMD_INLINE},
     {"lastsave",1,REDIS_CMD_INLINE},
     {"type",2,REDIS_CMD_INLINE},
     {"shutdown",1,REDIS_CMD_INLINE},
     {"lastsave",1,REDIS_CMD_INLINE},
     {"type",2,REDIS_CMD_INLINE},


@@ -175,11 +181,12 @@ static sds cliReadLine(int fd) {
     return sdstrim(line,"\r\n");
 }
 
     return sdstrim(line,"\r\n");
 }
 

-static int cliReadSingleLineReply(int fd) {
+static int cliReadSingleLineReply(int fd, int quiet) {

     sds reply = cliReadLine(fd);
 
     if (reply == NULL) return 1;
     sds reply = cliReadLine(fd);
 
     if (reply == NULL) return 1;

-    printf("%s\n", reply);
+    if (!quiet)
+        printf("%s\n", reply);

     return 0;
 }
 
     return 0;
 }
 


@@ -237,13 +244,13 @@ static int cliReadReply(int fd) {
     switch(type) {
     case '-':
         printf("(error) ");
     switch(type) {
     case '-':
         printf("(error) ");

-        cliReadSingleLineReply(fd);
+        cliReadSingleLineReply(fd,0);

         return 1;
     case '+':
         return 1;
     case '+':

-        return cliReadSingleLineReply(fd);
+        return cliReadSingleLineReply(fd,0);

     case ':':
         printf("(integer) ");
     case ':':
         printf("(integer) ");

-        return cliReadSingleLineReply(fd);
+        return cliReadSingleLineReply(fd,0);

     case '$':
         return cliReadBulkReply(fd);
     case '*':
     case '$':
         return cliReadBulkReply(fd);
     case '*':


@@ -254,6 +261,28 @@ static int cliReadReply(int fd) {
     }
 }
 
     }
 }
 

+static int selectDb(int fd)
+{
+    int retval;
+    sds cmd;
+    char type;
+
+    if (config.dbnum == 0)
+        return 0;
+
+    cmd = sdsempty();
+    cmd = sdscatprintf(cmd,"SELECT %d\r\n",config.dbnum);
+    anetWrite(fd,cmd,sdslen(cmd));
+    anetRead(fd,&type,1);
+    if (type <= 0 || type != '+') return 1;
+    retval = cliReadSingleLineReply(fd,1);
+    if (retval) {
+        close(fd);
+       return retval;
+    }
+    return 0;
+}
+

 static int cliSendCommand(int argc, char **argv) {
     struct redisCommand *rc = lookupCommand(argv[0]);
     int fd, j, retval = 0;
 static int cliSendCommand(int argc, char **argv) {
     struct redisCommand *rc = lookupCommand(argv[0]);
     int fd, j, retval = 0;


@@ -271,13 +300,21 @@ static int cliSendCommand(int argc, char **argv) {
     }
     if ((fd = cliConnect()) == -1) return 1;
 
     }
     if ((fd = cliConnect()) == -1) return 1;
 

+    /* Select db number */
+    retval = selectDb(fd);
+    if (retval) {
+        fprintf(stderr,"Error setting DB num\n");
+        return 1;
+    }
+ 

     while(config.repeat--) {
         /* Build the command to send */
         cmd = sdsempty();
         if (rc->flags & REDIS_CMD_MULTIBULK) {
             cmd = sdscatprintf(cmd,"*%d\r\n",argc);
             for (j = 0; j < argc; j++) {
     while(config.repeat--) {
         /* Build the command to send */
         cmd = sdsempty();
         if (rc->flags & REDIS_CMD_MULTIBULK) {
             cmd = sdscatprintf(cmd,"*%d\r\n",argc);
             for (j = 0; j < argc; j++) {

-                cmd = sdscatprintf(cmd,"$%d\r\n",sdslen(argv[j]));
+                cmd = sdscatprintf(cmd,"$%lu\r\n",
+                    (unsigned long)sdslen(argv[j]));

                 cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
                 cmd = sdscatlen(cmd,"\r\n",2);
             }
                 cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
                 cmd = sdscatlen(cmd,"\r\n",2);
             }


@@ -285,7 +322,8 @@ static int cliSendCommand(int argc, char **argv) {
             for (j = 0; j < argc; j++) {
                 if (j != 0) cmd = sdscat(cmd," ");
                 if (j == argc-1 && rc->flags & REDIS_CMD_BULK) {
             for (j = 0; j < argc; j++) {
                 if (j != 0) cmd = sdscat(cmd," ");
                 if (j == argc-1 && rc->flags & REDIS_CMD_BULK) {

-                    cmd = sdscatprintf(cmd,"%d",sdslen(argv[j]));
+                    cmd = sdscatprintf(cmd,"%lu",
+                        (unsigned long)sdslen(argv[j]));

                 } else {
                     cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
                 }
                 } else {
                     cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
                 }


@@ -328,6 +366,9 @@ static int parseOptions(int argc, char **argv) {
         } else if (!strcmp(argv[i],"-r") && !lastarg) {
             config.repeat = strtoll(argv[i+1],NULL,10);
             i++;
         } else if (!strcmp(argv[i],"-r") && !lastarg) {
             config.repeat = strtoll(argv[i+1],NULL,10);
             i++;

+        } else if (!strcmp(argv[i],"-n") && !lastarg) {
+            config.dbnum = atoi(argv[i+1]);
+            i++;

         } else {
             break;
         }
         } else {
             break;
         }


@@ -360,6 +401,7 @@ int main(int argc, char **argv) {
     config.hostip = "127.0.0.1";
     config.hostport = 6379;
     config.repeat = 1;
     config.hostip = "127.0.0.1";
     config.hostport = 6379;
     config.repeat = 1;

+    config.dbnum = 0;

 
     firstarg = parseOptions(argc,argv);
     argc -= firstarg;
 
     firstarg = parseOptions(argc,argv);
     argc -= firstarg;


@@ -371,8 +413,8 @@ int main(int argc, char **argv) {
         argvcopy[j] = sdsnew(argv[j]);
 
     if (argc < 1) {
         argvcopy[j] = sdsnew(argv[j]);
 
     if (argc < 1) {

-        fprintf(stderr, "usage: redis-cli [-h host] [-p port] [-r repeat_times] cmd arg1 arg2 arg3 ... argN\n");
-        fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-p port] -r [repeat_times] cmd arg1 arg2 ... arg(N-1)\n");
+        fprintf(stderr, "usage: redis-cli [-h host] [-p port] [-r repeat_times] [-n db_num] cmd arg1 arg2 arg3 ... argN\n");
+        fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-p port] [-r repeat_times] [-n db_num] cmd arg1 arg2 ... arg(N-1)\n");

         fprintf(stderr, "\nIf a pipe from standard input is detected this data is used as last argument.\n\n");
         fprintf(stderr, "example: cat /etc/passwd | redis-cli set my_passwd\n");
         fprintf(stderr, "example: redis-cli get my_passwd\n");
         fprintf(stderr, "\nIf a pipe from standard input is detected this data is used as last argument.\n\n");
         fprintf(stderr, "example: cat /etc/passwd | redis-cli set my_passwd\n");
         fprintf(stderr, "example: redis-cli get my_passwd\n");