Merge branch 'issue327' into unstable

[redis.git] / src / redis-cli.c

diff --git a/src/redis-cli.c b/src/redis-cli.c
index 328cd3df207e1561e2e5f9bc3e517b75c94b9534..3f60a1329db72048ff8a9e0e6391d79e9b081f18 100644 (file)
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -62,11 +62,14 @@ static struct config {
     int monitor_mode;
     int pubsub_mode;
     int latency_mode;
     int monitor_mode;
     int pubsub_mode;
     int latency_mode;

+    int cluster_mode;
+    int cluster_reissue_command;

     int stdinarg; /* get last arg from stdin. (-x option) */
     char *auth;
     int raw_output; /* output mode per command */
     sds mb_delim;
     char prompt[32];
     int stdinarg; /* get last arg from stdin. (-x option) */
     char *auth;
     int raw_output; /* output mode per command */
     sds mb_delim;
     char prompt[32];

+    char *eval;

 } config;
 
 static void usage();
 } config;
 
 static void usage();


@@ -428,6 +431,7 @@ static int cliReadReply(int output_raw_strings) {
     void *_reply;
     redisReply *reply;
     sds out;
     void *_reply;
     redisReply *reply;
     sds out;

+    int output = 1;

 
     if (redisGetReply(context,&_reply) != REDIS_OK) {
         if (config.shutdown)
 
     if (redisGetReply(context,&_reply) != REDIS_OK) {
         if (config.shutdown)


@@ -445,18 +449,49 @@ static int cliReadReply(int output_raw_strings) {
     }
 
     reply = (redisReply*)_reply;
     }
 
     reply = (redisReply*)_reply;

-    if (output_raw_strings) {
-        out = cliFormatReplyRaw(reply);
-    } else {
-        if (config.raw_output) {
+
+    /* Check if we need to connect to a different node and reissue the request. */
+    if (config.cluster_mode && reply->type == REDIS_REPLY_ERROR &&
+        (!strncmp(reply->str,"MOVED",5) || !strcmp(reply->str,"ASK")))
+    {
+        char *p = reply->str, *s;
+        int slot;
+
+        output = 0;
+        /* Comments show the position of the pointer as:
+         *
+         * [S] for pointer 's'
+         * [P] for pointer 'p'
+         */
+        s = strchr(p,' ');      /* MOVED[S]3999 127.0.0.1:6381 */
+        p = strchr(s+1,' ');    /* MOVED[S]3999[P]127.0.0.1:6381 */
+        *p = '\0';
+        slot = atoi(s+1);
+        s = strchr(p+1,':');    /* MOVED 3999[P]127.0.0.1[S]6381 */
+        *s = '\0';
+        sdsfree(config.hostip);
+        config.hostip = sdsnew(p+1);
+        config.hostport = atoi(s+1);
+        if (config.interactive)
+            printf("-> Redirected to slot [%d] located at %s:%d\n",
+                slot, config.hostip, config.hostport);
+        config.cluster_reissue_command = 1;
+    }
+
+    if (output) {
+        if (output_raw_strings) {

             out = cliFormatReplyRaw(reply);
             out = cliFormatReplyRaw(reply);

-            out = sdscat(out,"\n");

         } else {
         } else {

-            out = cliFormatReplyTTY(reply,"");
+            if (config.raw_output) {
+                out = cliFormatReplyRaw(reply);
+                out = sdscat(out,"\n");
+            } else {
+                out = cliFormatReplyTTY(reply,"");
+            }

         }
         }

+        fwrite(out,sdslen(out),1,stdout);
+        sdsfree(out);

     }
     }

-    fwrite(out,sdslen(out),1,stdout);
-    sdsfree(out);

     freeReplyObject(reply);
     return REDIS_OK;
 }
     freeReplyObject(reply);
     return REDIS_OK;
 }


@@ -539,8 +574,7 @@ static int parseOptions(int argc, char **argv) {
 
         if (!strcmp(argv[i],"-h") && !lastarg) {
             sdsfree(config.hostip);
 
         if (!strcmp(argv[i],"-h") && !lastarg) {
             sdsfree(config.hostip);

-            config.hostip = sdsnew(argv[i+1]);
-            i++;
+            config.hostip = sdsnew(argv[++i]);

         } else if (!strcmp(argv[i],"-h") && lastarg) {
             usage();
         } else if (!strcmp(argv[i],"--help")) {
         } else if (!strcmp(argv[i],"-h") && lastarg) {
             usage();
         } else if (!strcmp(argv[i],"--help")) {


@@ -548,32 +582,29 @@ static int parseOptions(int argc, char **argv) {
         } else if (!strcmp(argv[i],"-x")) {
             config.stdinarg = 1;
         } else if (!strcmp(argv[i],"-p") && !lastarg) {
         } else if (!strcmp(argv[i],"-x")) {
             config.stdinarg = 1;
         } else if (!strcmp(argv[i],"-p") && !lastarg) {

-            config.hostport = atoi(argv[i+1]);
-            i++;
+            config.hostport = atoi(argv[++i]);

         } else if (!strcmp(argv[i],"-s") && !lastarg) {
         } else if (!strcmp(argv[i],"-s") && !lastarg) {

-            config.hostsocket = argv[i+1];
-            i++;
+            config.hostsocket = argv[++i];

         } else if (!strcmp(argv[i],"-r") && !lastarg) {
         } else if (!strcmp(argv[i],"-r") && !lastarg) {

-            config.repeat = strtoll(argv[i+1],NULL,10);
-            i++;
+            config.repeat = strtoll(argv[++i],NULL,10);

         } else if (!strcmp(argv[i],"-i") && !lastarg) {
         } else if (!strcmp(argv[i],"-i") && !lastarg) {

-            double seconds = atof(argv[i+1]);
+            double seconds = atof(argv[++i]);

             config.interval = seconds*1000000;
             config.interval = seconds*1000000;

-            i++;

         } else if (!strcmp(argv[i],"-n") && !lastarg) {
         } else if (!strcmp(argv[i],"-n") && !lastarg) {

-            config.dbnum = atoi(argv[i+1]);
-            i++;
+            config.dbnum = atoi(argv[++i]);

         } else if (!strcmp(argv[i],"-a") && !lastarg) {
         } else if (!strcmp(argv[i],"-a") && !lastarg) {

-            config.auth = argv[i+1];
-            i++;
+            config.auth = argv[++i];

         } else if (!strcmp(argv[i],"--raw")) {
             config.raw_output = 1;
         } else if (!strcmp(argv[i],"--latency")) {
             config.latency_mode = 1;
         } else if (!strcmp(argv[i],"--raw")) {
             config.raw_output = 1;
         } else if (!strcmp(argv[i],"--latency")) {
             config.latency_mode = 1;

+        } else if (!strcmp(argv[i],"--eval") && !lastarg) {
+            config.eval = argv[++i];
+        } else if (!strcmp(argv[i],"-c")) {
+            config.cluster_mode = 1;

         } else if (!strcmp(argv[i],"-d") && !lastarg) {
             sdsfree(config.mb_delim);
         } else if (!strcmp(argv[i],"-d") && !lastarg) {
             sdsfree(config.mb_delim);

-            config.mb_delim = sdsnew(argv[i+1]);
-            i++;
+            config.mb_delim = sdsnew(argv[++i]);

         } else if (!strcmp(argv[i],"-v") || !strcmp(argv[i], "--version")) {
             sds version = cliVersion();
             printf("redis-cli %s\n", version);
         } else if (!strcmp(argv[i],"-v") || !strcmp(argv[i], "--version")) {
             sds version = cliVersion();
             printf("redis-cli %s\n", version);


@@ -619,8 +650,10 @@ static void usage() {
 "  -n <db>          Database number\n"
 "  -x               Read last argument from STDIN\n"
 "  -d <delimiter>   Multi-bulk delimiter in for raw formatting (default: \\n)\n"
 "  -n <db>          Database number\n"
 "  -x               Read last argument from STDIN\n"
 "  -d <delimiter>   Multi-bulk delimiter in for raw formatting (default: \\n)\n"

+"  -c               Enable cluster mode (follow -ASK and -MOVED redirections)\n"

 "  --raw            Use raw formatting for replies (default when STDOUT is not a tty)\n"
 "  --latency        Enter a special mode continuously sampling latency.\n"
 "  --raw            Use raw formatting for replies (default when STDOUT is not a tty)\n"
 "  --latency        Enter a special mode continuously sampling latency.\n"

+"  --eval <file>    Send an EVAL command using the Lua script at <file>.\n"

 "  --help           Output this help and exit\n"
 "  --version        Output version and exit\n"
 "\n"
 "  --help           Output this help and exit\n"
 "  --version        Output version and exit\n"
 "\n"


@@ -629,6 +662,8 @@ static void usage() {
 "  redis-cli get mypasswd\n"
 "  redis-cli -r 100 lpush mylist x\n"
 "  redis-cli -r 100 -i 1 info | grep used_memory_human:\n"
 "  redis-cli get mypasswd\n"
 "  redis-cli -r 100 lpush mylist x\n"
 "  redis-cli -r 100 -i 1 info | grep used_memory_human:\n"

+"  redis-cli --eval myscript.lua key1 key2 , arg1 arg2 arg3\n"
+"  (Note: when using --eval the comma separates KEYS[] from ARGV[] items)\n"

 "\n"
 "When no command is given, redis-cli starts in interactive mode.\n"
 "Type \"help\" in interactive mode for information on available commands.\n"
 "\n"
 "When no command is given, redis-cli starts in interactive mode.\n"
 "Type \"help\" in interactive mode for information on available commands.\n"


@@ -679,6 +714,7 @@ static void repl() {
 
             if (argv == NULL) {
                 printf("Invalid argument(s)\n");
 
             if (argv == NULL) {
                 printf("Invalid argument(s)\n");

+                free(line);

                 continue;
             } else if (argc > 0) {
                 if (strcasecmp(argv[0],"quit") == 0 ||
                 continue;
             } else if (argc > 0) {
                 if (strcasecmp(argv[0],"quit") == 0 ||


@@ -697,22 +733,31 @@ static void repl() {
                     int repeat, skipargs = 0;
 
                     repeat = atoi(argv[0]);
                     int repeat, skipargs = 0;
 
                     repeat = atoi(argv[0]);

-                    if (repeat) {
+                    if (argc > 1 && repeat) {

                         skipargs = 1;
                     } else {
                         repeat = 1;
                     }
 
                         skipargs = 1;
                     } else {
                         repeat = 1;
                     }
 

-                    if (cliSendCommand(argc-skipargs,argv+skipargs,repeat)
-                        != REDIS_OK)
-                    {
-                        cliConnect(1);
-
-                        /* If we still cannot send the command print error.
-                         * We'll try to reconnect the next time. */
+                    while (1) {
+                        config.cluster_reissue_command = 0;

                         if (cliSendCommand(argc-skipargs,argv+skipargs,repeat)
                             != REDIS_OK)
                         if (cliSendCommand(argc-skipargs,argv+skipargs,repeat)
                             != REDIS_OK)

-                            cliPrintContextError();
+                        {
+                            cliConnect(1);
+
+                            /* If we still cannot send the command print error.
+                             * We'll try to reconnect the next time. */
+                            if (cliSendCommand(argc-skipargs,argv+skipargs,repeat)
+                                != REDIS_OK)
+                                cliPrintContextError();
+                        }
+                        /* Issue the command again if we got redirected in cluster mode */
+                        if (config.cluster_mode && config.cluster_reissue_command) {
+                            cliConnect(1);
+                        } else {
+                            break;
+                        }

                     }
                     elapsed = mstime()-start_time;
                     if (elapsed >= 500) {
                     }
                     elapsed = mstime()-start_time;
                     if (elapsed >= 500) {


@@ -743,6 +788,44 @@ static int noninteractive(int argc, char **argv) {
     return retval;
 }
 
     return retval;
 }
 

+static int evalMode(int argc, char **argv) {
+    sds script = sdsempty();
+    FILE *fp;
+    char buf[1024];
+    size_t nread;
+    char **argv2;
+    int j, got_comma = 0, keys = 0;
+
+    /* Load the script from the file, as an sds string. */
+    fp = fopen(config.eval,"r");
+    if (!fp) {
+        fprintf(stderr,
+            "Can't open file '%s': %s\n", config.eval, strerror(errno));
+        exit(1);
+    }
+    while((nread = fread(buf,1,sizeof(buf),fp)) != 0) {
+        script = sdscatlen(script,buf,nread);
+    }
+    fclose(fp);
+
+    /* Create our argument vector */
+    argv2 = zmalloc(sizeof(sds)*(argc+3));
+    argv2[0] = sdsnew("EVAL");
+    argv2[1] = script;
+    for (j = 0; j < argc; j++) {
+        if (!got_comma && argv[j][0] == ',' && argv[j][1] == 0) {
+            got_comma = 1;
+            continue;
+        }
+        argv2[j+3-got_comma] = sdsnew(argv[j]);
+        if (!got_comma) keys++;
+    }
+    argv2[2] = sdscatprintf(sdsempty(),"%d",keys);
+
+    /* Call it */
+    return cliSendCommand(argc+3-got_comma, argv2, config.repeat);
+}
+

 static void latencyMode(void) {
     redisReply *reply;
     long long start, latency, min, max, tot, count = 0;
 static void latencyMode(void) {
     redisReply *reply;
     long long start, latency, min, max, tot, count = 0;


@@ -789,8 +872,10 @@ int main(int argc, char **argv) {
     config.monitor_mode = 0;
     config.pubsub_mode = 0;
     config.latency_mode = 0;
     config.monitor_mode = 0;
     config.pubsub_mode = 0;
     config.latency_mode = 0;

+    config.cluster_mode = 0;

     config.stdinarg = 0;
     config.auth = NULL;
     config.stdinarg = 0;
     config.auth = NULL;

+    config.eval = NULL;

     config.raw_output = !isatty(fileno(stdout)) && (getenv("FAKETTY") == NULL);
     config.mb_delim = sdsnew("\n");
     cliInitHelp();
     config.raw_output = !isatty(fileno(stdout)) && (getenv("FAKETTY") == NULL);
     config.mb_delim = sdsnew("\n");
     cliInitHelp();


@@ -806,7 +891,7 @@ int main(int argc, char **argv) {
     }
 
     /* Start interactive mode when no command is provided */
     }
 
     /* Start interactive mode when no command is provided */

-    if (argc == 0) {
+    if (argc == 0 && !config.eval) {

         /* Note that in repl mode we don't abort on connection error.
          * A new attempt will be performed for every command send. */
         cliConnect(0);
         /* Note that in repl mode we don't abort on connection error.
          * A new attempt will be performed for every command send. */
         cliConnect(0);


@@ -815,5 +900,9 @@ int main(int argc, char **argv) {
 
     /* Otherwise, we have some arguments to execute */
     if (cliConnect(0) != REDIS_OK) exit(1);
 
     /* Otherwise, we have some arguments to execute */
     if (cliConnect(0) != REDIS_OK) exit(1);

-    return noninteractive(argc,convertToSds(argc,argv));
+    if (config.eval) {
+        return evalMode(argc,argv);
+    } else {
+        return noninteractive(argc,convertToSds(argc,argv));
+    }

 }
 }