Merge pull request #209 from woowenjie/unstable

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

diff --git a/src/redis-cli.c b/src/redis-cli.c
index 328cd3df207e1561e2e5f9bc3e517b75c94b9534..cbaac3f95e774f6504308ae7d5e3076a2ad732c3 100644 (file)
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -62,6 +62,8 @@ 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 */
     int stdinarg; /* get last arg from stdin. (-x option) */
     char *auth;
     int raw_output; /* output mode per command */


@@ -428,6 +430,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 +448,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;
 }


@@ -570,6 +604,8 @@ static int parseOptions(int argc, char **argv) {
             config.raw_output = 1;
         } else if (!strcmp(argv[i],"--latency")) {
             config.latency_mode = 1;
             config.raw_output = 1;
         } else if (!strcmp(argv[i],"--latency")) {
             config.latency_mode = 1;

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

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


@@ -619,6 +655,7 @@ 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"
 "  --help           Output this help and exit\n"
 "  --raw            Use raw formatting for replies (default when STDOUT is not a tty)\n"
 "  --latency        Enter a special mode continuously sampling latency.\n"
 "  --help           Output this help and exit\n"


@@ -679,6 +716,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 +735,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) {


@@ -789,6 +836,7 @@ 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.raw_output = !isatty(fileno(stdout)) && (getenv("FAKETTY") == NULL);
     config.stdinarg = 0;
     config.auth = NULL;
     config.raw_output = !isatty(fileno(stdout)) && (getenv("FAKETTY") == NULL);