X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/70003d28b8d7430f9e0104575e7160be2f264602..0d7170a4545d8771f64441f591f95015ba65212a:/redis-cli.c?ds=sidebyside

diff --git a/redis-cli.c b/redis-cli.c
index f6bf739b..a082a9bb 100644
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -28,6 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "fmacros.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -40,17 +42,15 @@
 
 #define REDIS_CMD_INLINE 1
 #define REDIS_CMD_BULK 2
-#define REDIS_CMD_INTREPLY 4
-#define REDIS_CMD_RETCODEREPLY 8
-#define REDIS_CMD_BULKREPLY 16
-#define REDIS_CMD_MULTIBULKREPLY 32
-#define REDIS_CMD_SINGLELINEREPLY 64
+#define REDIS_CMD_MULTIBULK 4
 
 #define REDIS_NOTUSED(V) ((void) V)
 
 static struct config {
     char *hostip;
     int hostport;
+    long repeat;
+    int dbnum;
 } config;
 
 struct redisCommand {
@@ -60,54 +60,85 @@ struct redisCommand {
 };
 
 static struct redisCommand cmdTable[] = {
-    {"get",2,REDIS_CMD_INLINE|REDIS_CMD_BULKREPLY},
-    {"set",3,REDIS_CMD_BULK|REDIS_CMD_RETCODEREPLY},
-    {"setnx",3,REDIS_CMD_BULK|REDIS_CMD_INTREPLY},
-    {"del",2,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"exists",2,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"incr",2,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"decr",2,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"rpush",3,REDIS_CMD_BULK|REDIS_CMD_RETCODEREPLY},
-    {"lpush",3,REDIS_CMD_BULK|REDIS_CMD_RETCODEREPLY},
-    {"rpop",2,REDIS_CMD_INLINE|REDIS_CMD_BULKREPLY},
-    {"lpop",2,REDIS_CMD_INLINE|REDIS_CMD_BULKREPLY},
-    {"llen",2,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"lindex",3,REDIS_CMD_INLINE|REDIS_CMD_BULKREPLY},
-    {"lset",4,REDIS_CMD_BULK|REDIS_CMD_RETCODEREPLY},
-    {"lrange",4,REDIS_CMD_INLINE|REDIS_CMD_MULTIBULKREPLY},
-    {"ltrim",4,REDIS_CMD_INLINE|REDIS_CMD_RETCODEREPLY},
-    {"lrem",4,REDIS_CMD_BULK|REDIS_CMD_INTREPLY},
-    {"sadd",3,REDIS_CMD_BULK|REDIS_CMD_INTREPLY},
-    {"srem",3,REDIS_CMD_BULK|REDIS_CMD_INTREPLY},
-    {"sismember",3,REDIS_CMD_BULK|REDIS_CMD_INTREPLY},
-    {"scard",2,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"sinter",-2,REDIS_CMD_INLINE|REDIS_CMD_MULTIBULKREPLY},
-    {"sinterstore",-3,REDIS_CMD_INLINE|REDIS_CMD_RETCODEREPLY},
-    {"smembers",2,REDIS_CMD_INLINE|REDIS_CMD_MULTIBULKREPLY},
-    {"incrby",3,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"decrby",3,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"randomkey",1,REDIS_CMD_INLINE|REDIS_CMD_SINGLELINEREPLY},
-    {"select",2,REDIS_CMD_INLINE|REDIS_CMD_RETCODEREPLY},
-    {"move",3,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"rename",3,REDIS_CMD_INLINE|REDIS_CMD_RETCODEREPLY},
-    {"renamenx",3,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"keys",2,REDIS_CMD_INLINE|REDIS_CMD_BULKREPLY},
-    {"dbsize",1,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"ping",1,REDIS_CMD_INLINE|REDIS_CMD_RETCODEREPLY},
-    {"echo",2,REDIS_CMD_BULK|REDIS_CMD_BULKREPLY},
-    {"save",1,REDIS_CMD_INLINE|REDIS_CMD_RETCODEREPLY},
-    {"bgsave",1,REDIS_CMD_INLINE|REDIS_CMD_RETCODEREPLY},
-    {"shutdown",1,REDIS_CMD_INLINE|REDIS_CMD_RETCODEREPLY},
-    {"lastsave",1,REDIS_CMD_INLINE|REDIS_CMD_INTREPLY},
-    {"type",2,REDIS_CMD_INLINE|REDIS_CMD_SINGLELINEREPLY},
-    {"flushdb",1,REDIS_CMD_INLINE|REDIS_CMD_RETCODEREPLY},
-    {"flushall",1,REDIS_CMD_INLINE|REDIS_CMD_RETCODEREPLY},
-    {"sort",-2,REDIS_CMD_INLINE|REDIS_CMD_MULTIBULKREPLY},
-    {"info",1,REDIS_CMD_INLINE|REDIS_CMD_BULKREPLY},
-    {"mget",-2,REDIS_CMD_INLINE|REDIS_CMD_MULTIBULKREPLY},
+    {"get",2,REDIS_CMD_INLINE},
+    {"set",3,REDIS_CMD_BULK},
+    {"setnx",3,REDIS_CMD_BULK},
+    {"del",-2,REDIS_CMD_INLINE},
+    {"exists",2,REDIS_CMD_INLINE},
+    {"incr",2,REDIS_CMD_INLINE},
+    {"decr",2,REDIS_CMD_INLINE},
+    {"rpush",3,REDIS_CMD_BULK},
+    {"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},
+    {"lrange",4,REDIS_CMD_INLINE},
+    {"ltrim",4,REDIS_CMD_INLINE},
+    {"lrem",4,REDIS_CMD_BULK},
+    {"rpoplpush",3,REDIS_CMD_BULK},
+    {"sadd",3,REDIS_CMD_BULK},
+    {"srem",3,REDIS_CMD_BULK},
+    {"smove",4,REDIS_CMD_BULK},
+    {"sismember",3,REDIS_CMD_BULK},
+    {"scard",2,REDIS_CMD_INLINE},
+    {"spop",2,REDIS_CMD_INLINE},
+    {"srandmember",2,REDIS_CMD_INLINE},
+    {"sinter",-2,REDIS_CMD_INLINE},
+    {"sinterstore",-3,REDIS_CMD_INLINE},
+    {"sunion",-2,REDIS_CMD_INLINE},
+    {"sunionstore",-3,REDIS_CMD_INLINE},
+    {"sdiff",-2,REDIS_CMD_INLINE},
+    {"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},
+    {"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},
+    {"decrby",3,REDIS_CMD_INLINE},
+    {"getset",3,REDIS_CMD_BULK},
+    {"randomkey",1,REDIS_CMD_INLINE},
+    {"select",2,REDIS_CMD_INLINE},
+    {"move",3,REDIS_CMD_INLINE},
+    {"rename",3,REDIS_CMD_INLINE},
+    {"renamenx",3,REDIS_CMD_INLINE},
+    {"keys",2,REDIS_CMD_INLINE},
+    {"dbsize",1,REDIS_CMD_INLINE},
+    {"ping",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},
+    {"flushdb",1,REDIS_CMD_INLINE},
+    {"flushall",1,REDIS_CMD_INLINE},
+    {"sort",-2,REDIS_CMD_INLINE},
+    {"info",1,REDIS_CMD_INLINE},
+    {"mget",-2,REDIS_CMD_INLINE},
+    {"expire",3,REDIS_CMD_INLINE},
+    {"expireat",3,REDIS_CMD_INLINE},
+    {"ttl",2,REDIS_CMD_INLINE},
+    {"slaveof",3,REDIS_CMD_INLINE},
+    {"debug",-2,REDIS_CMD_INLINE},
+    {"mset",-3,REDIS_CMD_MULTIBULK},
+    {"msetnx",-3,REDIS_CMD_MULTIBULK},
     {NULL,0,0}
 };
 
+static int cliReadReply(int fd);
+
 static struct redisCommand *lookupCommand(char *name) {
     int j = 0;
     while(cmdTable[j].name != NULL) {
@@ -135,11 +166,13 @@ static sds cliReadLine(int fd) {
 
     while(1) {
         char c;
+        ssize_t ret;
 
-        if (read(fd,&c,1) == -1) {
+        ret = read(fd,&c,1);
+        if (ret == -1) {
             sdsfree(line);
             return NULL;
-        } else if (c == '\n') {
+        } else if ((ret == 0) || (c == '\n')) {
             break;
         } else {
             line = sdscatlen(line,&c,1);
@@ -148,38 +181,27 @@ static sds cliReadLine(int fd) {
     return sdstrim(line,"\r\n");
 }
 
-static int cliReadInlineReply(int fd, int type) {
+static int cliReadSingleLineReply(int fd, int quiet) {
     sds reply = cliReadLine(fd);
 
     if (reply == NULL) return 1;
-    printf("%s\n", reply);
-    if (type == REDIS_CMD_SINGLELINEREPLY) return 0;
-    if (type == REDIS_CMD_INTREPLY) return atoi(reply) < 0;
-    if (type == REDIS_CMD_RETCODEREPLY) return reply[0] == '-';
+    if (!quiet)
+        printf("%s\n", reply);
     return 0;
 }
 
-static int cliReadBulkReply(int fd, int multibulk) {
+static int cliReadBulkReply(int fd) {
     sds replylen = cliReadLine(fd);
     char *reply, crlf[2];
-    int bulklen, error = 0;
+    int bulklen;
 
     if (replylen == NULL) return 1;
-    if (strcmp(replylen,"nil") == 0) {
-        sdsfree(replylen);
-        printf("(nil)\n");
-        return 0;
-    }
     bulklen = atoi(replylen);
-    if (multibulk && bulklen == -1) {
+    if (bulklen == -1) {
         sdsfree(replylen);
-        printf("(nil)");
+        printf("(nil)\n");
         return 0;
     }
-    if (bulklen < 0) {
-        bulklen = -bulklen;
-        error = 1;
-    }
     reply = zmalloc(bulklen);
     anetRead(fd,reply,bulklen);
     anetRead(fd,crlf,2);
@@ -187,10 +209,10 @@ static int cliReadBulkReply(int fd, int multibulk) {
         zfree(reply);
         return 1;
     }
-    if (!multibulk && isatty(fileno(stdout)) && reply[bulklen-1] != '\n')
+    if (isatty(fileno(stdout)) && reply[bulklen-1] != '\n')
         printf("\n");
     zfree(reply);
-    return error;
+    return 0;
 }
 
 static int cliReadMultiBulkReply(int fd) {
@@ -198,25 +220,73 @@ static int cliReadMultiBulkReply(int fd) {
     int elements, c = 1;
 
     if (replylen == NULL) return 1;
-    if (strcmp(replylen,"nil") == 0) {
+    elements = atoi(replylen);
+    if (elements == -1) {
         sdsfree(replylen);
         printf("(nil)\n");
         return 0;
     }
-    elements = atoi(replylen);
+    if (elements == 0) {
+        printf("(empty list or set)\n");
+    }
     while(elements--) {
         printf("%d. ", c);
-        if (cliReadBulkReply(fd,1)) return 1;
-        printf("\n");
+        if (cliReadReply(fd)) return 1;
         c++;
     }
     return 0;
 }
 
+static int cliReadReply(int fd) {
+    char type;
+
+    if (anetRead(fd,&type,1) <= 0) exit(1);
+    switch(type) {
+    case '-':
+        printf("(error) ");
+        cliReadSingleLineReply(fd,0);
+        return 1;
+    case '+':
+        return cliReadSingleLineReply(fd,0);
+    case ':':
+        printf("(integer) ");
+        return cliReadSingleLineReply(fd,0);
+    case '$':
+        return cliReadBulkReply(fd);
+    case '*':
+        return cliReadMultiBulkReply(fd);
+    default:
+        printf("protocol error, got '%c' as reply type byte\n", type);
+        return 1;
+    }
+}
+
+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;
-    sds cmd = sdsempty();
+    sds cmd;
 
     if (!rc) {
         fprintf(stderr,"Unknown command '%s'\n",argv[0]);
@@ -224,41 +294,53 @@ static int cliSendCommand(int argc, char **argv) {
     }
 
     if ((rc->arity > 0 && argc != rc->arity) ||
-        (rc->arity < 0 && argc < rc->arity)) {
+        (rc->arity < 0 && argc < -rc->arity)) {
             fprintf(stderr,"Wrong number of arguments for '%s'\n",rc->name);
             return 1;
     }
     if ((fd = cliConnect()) == -1) return 1;
 
-    /* Build the command to send */
-    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]));
+    /* 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++) {
+                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);
+            }
         } else {
-            cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
+            for (j = 0; j < argc; j++) {
+                if (j != 0) cmd = sdscat(cmd," ");
+                if (j == argc-1 && rc->flags & REDIS_CMD_BULK) {
+                    cmd = sdscatprintf(cmd,"%lu",
+                        (unsigned long)sdslen(argv[j]));
+                } else {
+                    cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
+                }
+            }
+            cmd = sdscat(cmd,"\r\n");
+            if (rc->flags & REDIS_CMD_BULK) {
+                cmd = sdscatlen(cmd,argv[argc-1],sdslen(argv[argc-1]));
+                cmd = sdscatlen(cmd,"\r\n",2);
+            }
+        }
+        anetWrite(fd,cmd,sdslen(cmd));
+        sdsfree(cmd);
+        retval = cliReadReply(fd);
+        if (retval) {
+            close(fd);
+            return retval;
         }
-    }
-    cmd = sdscat(cmd,"\r\n");
-    if (rc->flags & REDIS_CMD_BULK) {
-        cmd = sdscatlen(cmd,argv[argc-1],sdslen(argv[argc-1]));
-        cmd = sdscat(cmd,"\r\n");
-    }
-    anetWrite(fd,cmd,sdslen(cmd));
-    if (rc->flags & REDIS_CMD_INTREPLY) {
-        retval = cliReadInlineReply(fd,REDIS_CMD_INTREPLY);
-    } else if (rc->flags & REDIS_CMD_RETCODEREPLY) {
-        retval = cliReadInlineReply(fd,REDIS_CMD_RETCODEREPLY);
-    } else if (rc->flags & REDIS_CMD_SINGLELINEREPLY) {
-        retval = cliReadInlineReply(fd,REDIS_CMD_SINGLELINEREPLY);
-    } else if (rc->flags & REDIS_CMD_BULKREPLY) {
-        retval = cliReadBulkReply(fd,0);
-    } else if (rc->flags & REDIS_CMD_MULTIBULKREPLY) {
-        retval = cliReadMultiBulkReply(fd);
-    }
-    if (retval) {
-        close(fd);
-        return retval;
     }
     close(fd);
     return 0;
@@ -281,6 +363,12 @@ static int parseOptions(int argc, char **argv) {
         } else if (!strcmp(argv[i],"-p") && !lastarg) {
             config.hostport = atoi(argv[i+1]);
             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;
         }
@@ -308,9 +396,12 @@ static sds readArgFromStdin(void) {
 int main(int argc, char **argv) {
     int firstarg, j;
     char **argvcopy;
+    struct redisCommand *rc;
 
     config.hostip = "127.0.0.1";
     config.hostport = 6379;
+    config.repeat = 1;
+    config.dbnum = 0;
 
     firstarg = parseOptions(argc,argv);
     argc -= firstarg;
@@ -321,21 +412,24 @@ int main(int argc, char **argv) {
     for(j = 0; j < argc; j++)
         argvcopy[j] = sdsnew(argv[j]);
 
-    /* Read the last argument from stdandard input */
-    if (!isatty(fileno(stdin))) {
-        sds lastarg = readArgFromStdin();
-        argvcopy[argc] = lastarg;
-        argc++;
-    }
-
     if (argc < 1) {
-        fprintf(stderr, "usage: redis-cli [-h host] [-p port] cmd arg1 arg2 arg3 ... argN\n");
-        fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-p port] 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, "example: redis-cli -r 100 lpush mylist x\n");
         exit(1);
     }
 
+    /* Read the last argument from stdandard input if needed */
+    if ((rc = lookupCommand(argv[0])) != NULL) {
+        if (rc->arity > 0 && argc == rc->arity-1) {
+            sds lastarg = readArgFromStdin();
+            argvcopy[argc] = lastarg;
+            argc++;
+        }
+    }
+
     return cliSendCommand(argc, argvcopy);
 }