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 ca70c9472e4cb26416012a1bd0dabc3c8c8ff77a..cbaac3f95e774f6504308ae7d5e3076a2ad732c3 100644 (file)
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -55,16 +55,20 @@ static struct config {
     int hostport;
     char *hostsocket;
     long repeat;
     int hostport;
     char *hostsocket;
     long repeat;

+    long interval;

     int dbnum;
     int interactive;
     int shutdown;
     int monitor_mode;
     int pubsub_mode;
     int dbnum;
     int interactive;
     int shutdown;
     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 stdinarg; /* get last arg from stdin. (-x option) */
     char *auth;

-    char *historyfile;

     int raw_output; /* output mode per command */
     sds mb_delim;
     int raw_output; /* output mode per command */
     sds mb_delim;

+    char prompt[32];

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


@@ -85,6 +89,15 @@ static long long mstime(void) {
     return mst;
 }
 
     return mst;
 }
 

+static void cliRefreshPrompt(void) {
+    if (config.dbnum == 0)
+        snprintf(config.prompt,sizeof(config.prompt),"redis %s:%d> ",
+            config.hostip, config.hostport);
+    else
+        snprintf(config.prompt,sizeof(config.prompt),"redis %s:%d[%d]> ",
+            config.hostip, config.hostport, config.dbnum);
+}
+

 /*------------------------------------------------------------------------------
  * Help functions
  *--------------------------------------------------------------------------- */
 /*------------------------------------------------------------------------------
  * Help functions
  *--------------------------------------------------------------------------- */


@@ -264,11 +277,9 @@ static int cliAuth() {
 /* Send SELECT dbnum to the server */
 static int cliSelect() {
     redisReply *reply;
 /* Send SELECT dbnum to the server */
 static int cliSelect() {
     redisReply *reply;

-    char dbnum[16];

     if (config.dbnum == 0) return REDIS_OK;
 
     if (config.dbnum == 0) return REDIS_OK;
 

-    snprintf(dbnum,sizeof(dbnum),"%d",config.dbnum);
-    reply = redisCommand(context,"SELECT %s",dbnum);
+    reply = redisCommand(context,"SELECT %d",config.dbnum);

     if (reply != NULL) {
         freeReplyObject(reply);
         return REDIS_OK;
     if (reply != NULL) {
         freeReplyObject(reply);
         return REDIS_OK;


@@ -309,10 +320,9 @@ static int cliConnect(int force) {
     return REDIS_OK;
 }
 
     return REDIS_OK;
 }
 

-static void cliPrintContextErrorAndExit() {
+static void cliPrintContextError() {

     if (context == NULL) return;
     fprintf(stderr,"Error: %s\n",context->errstr);
     if (context == NULL) return;
     fprintf(stderr,"Error: %s\n",context->errstr);

-    exit(1);

 }
 
 static sds cliFormatReplyTTY(redisReply *r, char *prefix) {
 }
 
 static sds cliFormatReplyTTY(redisReply *r, char *prefix) {


@@ -389,15 +399,18 @@ static sds cliFormatReplyRaw(redisReply *r) {
     switch (r->type) {
     case REDIS_REPLY_NIL:
         /* Nothing... */
     switch (r->type) {
     case REDIS_REPLY_NIL:
         /* Nothing... */

-    break;
+        break;

     case REDIS_REPLY_ERROR:
     case REDIS_REPLY_ERROR:

+        out = sdscatlen(out,r->str,r->len);
+        out = sdscatlen(out,"\n",1);
+        break;

     case REDIS_REPLY_STATUS:
     case REDIS_REPLY_STRING:
         out = sdscatlen(out,r->str,r->len);
     case REDIS_REPLY_STATUS:
     case REDIS_REPLY_STRING:
         out = sdscatlen(out,r->str,r->len);

-    break;
+        break;

     case REDIS_REPLY_INTEGER:
         out = sdscatprintf(out,"%lld",r->integer);
     case REDIS_REPLY_INTEGER:
         out = sdscatprintf(out,"%lld",r->integer);

-    break;
+        break;

     case REDIS_REPLY_ARRAY:
         for (i = 0; i < r->elements; i++) {
             if (i > 0) out = sdscat(out,config.mb_delim);
     case REDIS_REPLY_ARRAY:
         for (i = 0; i < r->elements; i++) {
             if (i > 0) out = sdscat(out,config.mb_delim);


@@ -405,7 +418,7 @@ static sds cliFormatReplyRaw(redisReply *r) {
             out = sdscatlen(out,tmp,sdslen(tmp));
             sdsfree(tmp);
         }
             out = sdscatlen(out,tmp,sdslen(tmp));
             sdsfree(tmp);
         }

-    break;
+        break;

     default:
         fprintf(stderr,"Unknown reply type: %d\n", r->type);
         exit(1);
     default:
         fprintf(stderr,"Unknown reply type: %d\n", r->type);
         exit(1);


@@ -414,10 +427,12 @@ static sds cliFormatReplyRaw(redisReply *r) {
 }
 
 static int cliReadReply(int output_raw_strings) {
 }
 
 static int cliReadReply(int output_raw_strings) {

+    void *_reply;

     redisReply *reply;
     sds out;
     redisReply *reply;
     sds out;

+    int output = 1;

 
 

-    if (redisGetReply(context,(void**)&reply) != REDIS_OK) {
+    if (redisGetReply(context,&_reply) != REDIS_OK) {

         if (config.shutdown)
             return REDIS_OK;
         if (config.interactive) {
         if (config.shutdown)
             return REDIS_OK;
         if (config.interactive) {


@@ -427,22 +442,55 @@ static int cliReadReply(int output_raw_strings) {
             if (context->err == REDIS_ERR_EOF)
                 return REDIS_ERR;
         }
             if (context->err == REDIS_ERR_EOF)
                 return REDIS_ERR;
         }

-        cliPrintContextErrorAndExit();
+        cliPrintContextError();
+        exit(1);

         return REDIS_ERR; /* avoid compiler warning */
     }
 
         return REDIS_ERR; /* avoid compiler warning */
     }
 

-    if (output_raw_strings) {
-        out = cliFormatReplyRaw(reply);
-    } else {
-        if (config.raw_output) {
+    reply = (redisReply*)_reply;
+
+    /* 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;
 }


@@ -452,12 +500,20 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
     size_t *argvlen;
     int j, output_raw;
 
     size_t *argvlen;
     int j, output_raw;
 

-    if (context == NULL) {
-        printf("Not connected, please use: connect <host> <port>\n");
-        return REDIS_OK;
+    if (context == NULL) return REDIS_ERR;
+
+    output_raw = 0;
+    if (!strcasecmp(command,"info") ||
+        (argc == 2 && !strcasecmp(command,"cluster") &&
+                      (!strcasecmp(argv[1],"nodes") ||
+                       !strcasecmp(argv[1],"info"))) ||
+        (argc == 2 && !strcasecmp(command,"client") &&
+                       !strcasecmp(argv[1],"list")))
+
+    {
+        output_raw = 1;

     }
 
     }
 

-    output_raw = !strcasecmp(command,"info");

     if (!strcasecmp(command,"help") || !strcasecmp(command,"?")) {
         cliOutputHelp(--argc, ++argv);
         return REDIS_OK;
     if (!strcasecmp(command,"help") || !strcasecmp(command,"?")) {
         cliOutputHelp(--argc, ++argv);
         return REDIS_OK;


@@ -487,9 +543,21 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
             }
         }
 
             }
         }
 

-        if (cliReadReply(output_raw) != REDIS_OK)
+        if (cliReadReply(output_raw) != REDIS_OK) {
+            free(argvlen);

             return REDIS_ERR;
             return REDIS_ERR;

+        } else {
+            /* Store database number when SELECT was successfully executed. */
+            if (!strcasecmp(command,"select") && argc == 2) {
+                config.dbnum = atoi(argv[1]);
+                cliRefreshPrompt();
+            }
+        }
+        if (config.interval) usleep(config.interval);
+        fflush(stdout); /* Make it grep friendly */

     }
     }

+
+    free(argvlen);

     return REDIS_OK;
 }
 
     return REDIS_OK;
 }
 


@@ -522,6 +590,10 @@ 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],"-i") && !lastarg) {
+            double seconds = atof(argv[i+1]);
+            config.interval = seconds*1000000;
+            i++;

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


@@ -530,6 +602,10 @@ static int parseOptions(int argc, char **argv) {
             i++;
         } else if (!strcmp(argv[i],"--raw")) {
             config.raw_output = 1;
             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],"-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]);


@@ -574,10 +650,14 @@ static void usage() {
 "  -s <socket>      Server socket (overrides hostname and port)\n"
 "  -a <password>    Password to use when connecting to the server\n"
 "  -r <repeat>      Execute specified command N times\n"
 "  -s <socket>      Server socket (overrides hostname and port)\n"
 "  -a <password>    Password to use when connecting to the server\n"
 "  -r <repeat>      Execute specified command N times\n"

+"  -i <interval>    When -r is used, waits <interval> seconds per command.\n"
+"                   It is possible to specify sub-second times like -i 0.1.\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"
 "  -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"
 "  --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"
 "  --version        Output version and exit\n"
 "\n"
 "  --help           Output this help and exit\n"
 "  --version        Output version and exit\n"
 "\n"


@@ -585,6 +665,7 @@ static void usage() {
 "  cat /etc/passwd | redis-cli -x set mypasswd\n"
 "  redis-cli get mypasswd\n"
 "  redis-cli -r 100 lpush mylist x\n"
 "  cat /etc/passwd | redis-cli -x set mypasswd\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"

 "\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"


@@ -607,20 +688,35 @@ static char **convertToSds(int count, char** args) {
 
 #define LINE_BUFLEN 4096
 static void repl() {
 
 #define LINE_BUFLEN 4096
 static void repl() {

-    int argc, j;
+    sds historyfile = NULL;
+    int history = 0;

     char *line;
     char *line;

+    int argc;

     sds *argv;
 
     config.interactive = 1;
     linenoiseSetCompletionCallback(completionCallback);
 
     sds *argv;
 
     config.interactive = 1;
     linenoiseSetCompletionCallback(completionCallback);
 

-    while((line = linenoise(context ? "redis> " : "not connected> ")) != NULL) {
+    /* Only use history when stdin is a tty. */
+    if (isatty(fileno(stdin))) {
+        history = 1;
+
+        if (getenv("HOME") != NULL) {
+            historyfile = sdscatprintf(sdsempty(),"%s/.rediscli_history",getenv("HOME"));
+            linenoiseHistoryLoad(historyfile);
+        }
+    }
+
+    cliRefreshPrompt();
+    while((line = linenoise(context ? config.prompt : "not connected> ")) != NULL) {

         if (line[0] != '\0') {
             argv = sdssplitargs(line,&argc);
         if (line[0] != '\0') {
             argv = sdssplitargs(line,&argc);

-            linenoiseHistoryAdd(line);
-            if (config.historyfile) linenoiseHistorySave(config.historyfile);
+            if (history) linenoiseHistoryAdd(line);
+            if (historyfile) linenoiseHistorySave(historyfile);
+

             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 ||


@@ -636,14 +732,34 @@ static void repl() {
                     linenoiseClearScreen();
                 } else {
                     long long start_time = mstime(), elapsed;
                     linenoiseClearScreen();
                 } else {
                     long long start_time = mstime(), elapsed;

+                    int repeat, skipargs = 0;

 
 

-                    if (cliSendCommand(argc,argv,1) != REDIS_OK) {
-                        cliConnect(1);
+                    repeat = atoi(argv[0]);
+                    if (argc > 1 && repeat) {
+                        skipargs = 1;
+                    } else {
+                        repeat = 1;
+                    }

 
 

-                        /* If we still cannot send the command,
-                         * print error and abort. */
-                        if (cliSendCommand(argc,argv,1) != REDIS_OK)
-                            cliPrintContextErrorAndExit();
+                    while (1) {
+                        config.cluster_reissue_command = 0;
+                        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. */
+                            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) {


@@ -652,8 +768,7 @@ static void repl() {
                 }
             }
             /* Free the argument vector */
                 }
             }
             /* Free the argument vector */

-            for (j = 0; j < argc; j++)
-                sdsfree(argv[j]);
+            while(argc--) sdsfree(argv[argc]);

             zfree(argv);
         }
         /* linenoise() returns malloc-ed lines like readline() */
             zfree(argv);
         }
         /* linenoise() returns malloc-ed lines like readline() */


@@ -675,6 +790,38 @@ static int noninteractive(int argc, char **argv) {
     return retval;
 }
 
     return retval;
 }
 

+static void latencyMode(void) {
+    redisReply *reply;
+    long long start, latency, min, max, tot, count = 0;
+    double avg;
+
+    if (!context) exit(1);
+    while(1) {
+        start = mstime();
+        reply = redisCommand(context,"PING");
+        if (reply == NULL) {
+            fprintf(stderr,"\nI/O error\n");
+            exit(1);
+        }
+        latency = mstime()-start;
+        freeReplyObject(reply);
+        count++;
+        if (count == 1) {
+            min = max = tot = latency;
+            avg = (double) latency;
+        } else {
+            if (latency < min) min = latency;
+            if (latency > max) max = latency;
+            tot += latency;
+            avg = (double) tot/count;
+        }
+        printf("\x1b[0G\x1b[2Kmin: %lld, max: %lld, avg: %.2f (%lld samples)",
+            min, max, avg, count);
+        fflush(stdout);
+        usleep(10000);
+    }
+}
+

 int main(int argc, char **argv) {
     int firstarg;
 
 int main(int argc, char **argv) {
     int firstarg;
 


@@ -682,33 +829,39 @@ int main(int argc, char **argv) {
     config.hostport = 6379;
     config.hostsocket = NULL;
     config.repeat = 1;
     config.hostport = 6379;
     config.hostsocket = NULL;
     config.repeat = 1;

+    config.interval = 0;

     config.dbnum = 0;
     config.interactive = 0;
     config.shutdown = 0;
     config.monitor_mode = 0;
     config.pubsub_mode = 0;
     config.dbnum = 0;
     config.interactive = 0;
     config.shutdown = 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.historyfile = 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();
 

-    if (getenv("HOME") != NULL) {
-        config.historyfile = malloc(256);
-        snprintf(config.historyfile,256,"%s/.rediscli_history",getenv("HOME"));
-        linenoiseHistoryLoad(config.historyfile);
-    }
-

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

-    /* Try to connect */
-    if (cliConnect(0) != REDIS_OK) exit(1);
+    /* Start in latency mode if appropriate */
+    if (config.latency_mode) {
+        cliConnect(0);
+        latencyMode();
+    }

 
     /* Start interactive mode when no command is provided */
 
     /* Start interactive mode when no command is provided */

-    if (argc == 0) repl();
+    if (argc == 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);
+        repl();
+    }
+

     /* Otherwise, we have some arguments to execute */
     /* Otherwise, we have some arguments to execute */

+    if (cliConnect(0) != REDIS_OK) exit(1);

     return noninteractive(argc,convertToSds(argc,argv));
 }
     return noninteractive(argc,convertToSds(argc,argv));
 }