First implementation of the slow log feature

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

diff --git a/src/redis-cli.c b/src/redis-cli.c
index 5071604b871112b23b0acdb3a7abd40881dc89b1..d0c9d979f014a769e88e78e311bf484f651e8f08 100644 (file)
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -38,290 +38,498 @@
 #include <ctype.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <errno.h>
 #include <sys/stat.h>

+#include <sys/time.h>
+#include <assert.h>

 
 

-#include "anet.h"
+#include "hiredis.h"

 #include "sds.h"
 #include "sds.h"

-#include "adlist.h"

 #include "zmalloc.h"
 #include "linenoise.h"
 #include "zmalloc.h"
 #include "linenoise.h"

-
-#define REDIS_CMD_INLINE 1
-#define REDIS_CMD_BULK 2
-#define REDIS_CMD_MULTIBULK 4
+#include "help.h"

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

+static redisContext *context;

 static struct config {
     char *hostip;
     int hostport;
 static struct config {
     char *hostip;
     int hostport;

+    char *hostsocket;

     long repeat;
     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 raw_output; /* output mode per command */
-    int tty; /* flag for default output format */

     int stdinarg; /* get last arg from stdin. (-x option) */
     int stdinarg; /* get last arg from stdin. (-x option) */

-    char mb_sep;

     char *auth;
     char *auth;

-    char *historyfile;
+    int raw_output; /* output mode per command */
+    sds mb_delim;
+    char prompt[32];

 } config;
 
 } config;
 

-static int cliReadReply(int fd);

 static void usage();
 static void usage();

+char *redisGitSHA1(void);
+char *redisGitDirty(void);

 
 

-/* Connect to the client. If force is not zero the connection is performed
- * even if there is already a connected socket. */
-static int cliConnect(int force) {
-    char err[ANET_ERR_LEN];
-    static int fd = ANET_ERR;
-
-    if (fd == ANET_ERR || force) {
-        if (force) close(fd);
-        fd = anetTcpConnect(err,config.hostip,config.hostport);
-        if (fd == ANET_ERR) {
-            fprintf(stderr, "Could not connect to Redis at %s:%d: %s", config.hostip, config.hostport, err);
-            return -1;
-        }
-        anetTcpNoDelay(NULL,fd);
+/*------------------------------------------------------------------------------
+ * Utility functions
+ *--------------------------------------------------------------------------- */
+
+static long long mstime(void) {
+    struct timeval tv;
+    long long mst;
+
+    gettimeofday(&tv, NULL);
+    mst = ((long)tv.tv_sec)*1000;
+    mst += tv.tv_usec/1000;
+    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
+ *--------------------------------------------------------------------------- */
+
+#define CLI_HELP_COMMAND 1
+#define CLI_HELP_GROUP 2
+
+typedef struct {
+    int type;
+    int argc;
+    sds *argv;
+    sds full;
+
+    /* Only used for help on commands */
+    struct commandHelp *org;
+} helpEntry;
+
+static helpEntry *helpEntries;
+static int helpEntriesLen;
+
+static sds cliVersion() {
+    sds version;
+    version = sdscatprintf(sdsempty(), "%s", REDIS_VERSION);
+
+    /* Add git commit and working tree status when available */
+    if (strtoll(redisGitSHA1(),NULL,16)) {
+        version = sdscatprintf(version, " (git:%s", redisGitSHA1());
+        if (strtoll(redisGitDirty(),NULL,10))
+            version = sdscatprintf(version, "-dirty");
+        version = sdscat(version, ")");

     }
     }

-    return fd;
+    return version;

 }
 
 }
 

-static sds cliReadLine(int fd) {
-    sds line = sdsempty();
+static void cliInitHelp() {
+    int commandslen = sizeof(commandHelp)/sizeof(struct commandHelp);
+    int groupslen = sizeof(commandGroups)/sizeof(char*);
+    int i, len, pos = 0;
+    helpEntry tmp;
+
+    helpEntriesLen = len = commandslen+groupslen;
+    helpEntries = malloc(sizeof(helpEntry)*len);
+
+    for (i = 0; i < groupslen; i++) {
+        tmp.argc = 1;
+        tmp.argv = malloc(sizeof(sds));
+        tmp.argv[0] = sdscatprintf(sdsempty(),"@%s",commandGroups[i]);
+        tmp.full = tmp.argv[0];
+        tmp.type = CLI_HELP_GROUP;
+        tmp.org = NULL;
+        helpEntries[pos++] = tmp;
+    }

 
 

-    while(1) {
-        char c;
-        ssize_t ret;
-
-        ret = read(fd,&c,1);
-        if (ret <= 0) {
-            sdsfree(line);
-            return NULL;
-        } else if ((ret == 0) || (c == '\n')) {
-            break;
-        } else {
-            line = sdscatlen(line,&c,1);
-        }
+    for (i = 0; i < commandslen; i++) {
+        tmp.argv = sdssplitargs(commandHelp[i].name,&tmp.argc);
+        tmp.full = sdsnew(commandHelp[i].name);
+        tmp.type = CLI_HELP_COMMAND;
+        tmp.org = &commandHelp[i];
+        helpEntries[pos++] = tmp;

     }
     }

-    return sdstrim(line,"\r\n");

 }
 
 }
 

-static int cliReadSingleLineReply(int fd, int quiet) {
-    sds reply = cliReadLine(fd);
+/* Output command help to stdout. */
+static void cliOutputCommandHelp(struct commandHelp *help, int group) {
+    printf("\r\n  \x1b[1m%s\x1b[0m \x1b[90m%s\x1b[0m\r\n", help->name, help->params);
+    printf("  \x1b[33msummary:\x1b[0m %s\r\n", help->summary);
+    printf("  \x1b[33msince:\x1b[0m %s\r\n", help->since);
+    if (group) {
+        printf("  \x1b[33mgroup:\x1b[0m %s\r\n", commandGroups[help->group]);
+    }
+}

 
 

-    if (reply == NULL) return 1;
-    if (!quiet)
-        printf("%s", reply);
-    sdsfree(reply);
-    return 0;
+/* Print generic help. */
+static void cliOutputGenericHelp() {
+    sds version = cliVersion();
+    printf(
+        "redis-cli %s\r\n"
+        "Type: \"help @<group>\" to get a list of commands in <group>\r\n"
+        "      \"help <command>\" for help on <command>\r\n"
+        "      \"help <tab>\" to get a list of possible help topics\r\n"
+        "      \"quit\" to exit\r\n",
+        version
+    );
+    sdsfree(version);

 }
 
 }
 

-static void printStringRepr(char *s, int len) {
-    printf("\"");
-    while(len--) {
-        switch(*s) {
-        case '\\':
-        case '"':
-            printf("\\%c",*s);
-            break;
-        case '\n': printf("\\n"); break;
-        case '\r': printf("\\r"); break;
-        case '\t': printf("\\t"); break;
-        case '\a': printf("\\a"); break;
-        case '\b': printf("\\b"); break;
-        default:
-            if (isprint(*s))
-                printf("%c",*s);
-            else
-                printf("\\x%02x",(unsigned char)*s);
-            break;
+/* Output all command help, filtering by group or command name. */
+static void cliOutputHelp(int argc, char **argv) {
+    int i, j, len;
+    int group = -1;
+    helpEntry *entry;
+    struct commandHelp *help;
+
+    if (argc == 0) {
+        cliOutputGenericHelp();
+        return;
+    } else if (argc > 0 && argv[0][0] == '@') {
+        len = sizeof(commandGroups)/sizeof(char*);
+        for (i = 0; i < len; i++) {
+            if (strcasecmp(argv[0]+1,commandGroups[i]) == 0) {
+                group = i;
+                break;
+            }
+        }
+    }
+
+    assert(argc > 0);
+    for (i = 0; i < helpEntriesLen; i++) {
+        entry = &helpEntries[i];
+        if (entry->type != CLI_HELP_COMMAND) continue;
+
+        help = entry->org;
+        if (group == -1) {
+            /* Compare all arguments */
+            if (argc == entry->argc) {
+                for (j = 0; j < argc; j++) {
+                    if (strcasecmp(argv[j],entry->argv[j]) != 0) break;
+                }
+                if (j == argc) {
+                    cliOutputCommandHelp(help,1);
+                }
+            }
+        } else {
+            if (group == help->group) {
+                cliOutputCommandHelp(help,0);
+            }

         }
         }

-        s++;

     }
     }

-    printf("\"");
+    printf("\r\n");

 }
 
 }
 

-static int cliReadBulkReply(int fd) {
-    sds replylen = cliReadLine(fd);
-    char *reply, crlf[2];
-    int bulklen;
-
-    if (replylen == NULL) return 1;
-    bulklen = atoi(replylen);
-    if (bulklen == -1) {
-        sdsfree(replylen);
-        printf("(nil)\n");
-        return 0;
+static void completionCallback(const char *buf, linenoiseCompletions *lc) {
+    size_t startpos = 0;
+    int mask;
+    int i;
+    size_t matchlen;
+    sds tmp;
+
+    if (strncasecmp(buf,"help ",5) == 0) {
+        startpos = 5;
+        while (isspace(buf[startpos])) startpos++;
+        mask = CLI_HELP_COMMAND | CLI_HELP_GROUP;
+    } else {
+        mask = CLI_HELP_COMMAND;

     }
     }

-    reply = zmalloc(bulklen);
-    anetRead(fd,reply,bulklen);
-    anetRead(fd,crlf,2);
-    if (config.raw_output || !config.tty) {
-        if (bulklen && fwrite(reply,bulklen,1,stdout) == 0) {
-            zfree(reply);
-            return 1;
+
+    for (i = 0; i < helpEntriesLen; i++) {
+        if (!(helpEntries[i].type & mask)) continue;
+
+        matchlen = strlen(buf+startpos);
+        if (strncasecmp(buf+startpos,helpEntries[i].full,matchlen) == 0) {
+            tmp = sdsnewlen(buf,startpos);
+            tmp = sdscat(tmp,helpEntries[i].full);
+            linenoiseAddCompletion(lc,tmp);
+            sdsfree(tmp);

         }
         }

-    } else {
-        /* If you are producing output for the standard output we want
-         * a more interesting output with quoted characters and so forth */
-        printStringRepr(reply,bulklen);

     }
     }

-    zfree(reply);
-    return 0;

 }
 
 }
 

-static int cliReadMultiBulkReply(int fd) {
-    sds replylen = cliReadLine(fd);
-    int elements, c = 1;
-    int retval = 0;
+/*------------------------------------------------------------------------------
+ * Networking / parsing
+ *--------------------------------------------------------------------------- */

 
 

-    if (replylen == NULL) return 1;
-    elements = atoi(replylen);
-    if (elements == -1) {
-        sdsfree(replylen);
-        printf("(nil)\n");
-        return 0;
-    }
-    if (elements == 0) {
-        printf("(empty list or set)\n");
+/* Send AUTH command to the server */
+static int cliAuth() {
+    redisReply *reply;
+    if (config.auth == NULL) return REDIS_OK;
+
+    reply = redisCommand(context,"AUTH %s",config.auth);
+    if (reply != NULL) {
+        freeReplyObject(reply);
+        return REDIS_OK;

     }
     }

-    while(elements--) {
-        if (config.tty) printf("%d. ", c);
-        if (cliReadReply(fd)) retval = 1;
-        if (elements) printf("%c",config.mb_sep);
-        c++;
+    return REDIS_ERR;
+}
+
+/* Send SELECT dbnum to the server */
+static int cliSelect() {
+    redisReply *reply;
+    if (config.dbnum == 0) return REDIS_OK;
+
+    reply = redisCommand(context,"SELECT %d",config.dbnum);
+    if (reply != NULL) {
+        freeReplyObject(reply);
+        return REDIS_OK;

     }
     }

-    return retval;
+    return REDIS_ERR;

 }
 
 }
 

-static int cliReadReply(int fd) {
-    char type;
-    int nread;
+/* Connect to the client. If force is not zero the connection is performed
+ * even if there is already a connected socket. */
+static int cliConnect(int force) {
+    if (context == NULL || force) {
+        if (context != NULL)
+            redisFree(context);

 
 

-    if ((nread = anetRead(fd,&type,1)) <= 0) {
-        if (config.shutdown) return 0;
-        if (config.interactive &&
-            (nread == 0 || (nread == -1 && errno == ECONNRESET)))
-        {
-            return ECONNRESET;
+        if (config.hostsocket == NULL) {
+            context = redisConnect(config.hostip,config.hostport);

         } else {
         } else {

-            printf("I/O error while reading from socket: %s",strerror(errno));
-            exit(1);
+            context = redisConnectUnix(config.hostsocket);

         }
         }

+
+        if (context->err) {
+            fprintf(stderr,"Could not connect to Redis at ");
+            if (config.hostsocket == NULL)
+                fprintf(stderr,"%s:%d: %s\n",config.hostip,config.hostport,context->errstr);
+            else
+                fprintf(stderr,"%s: %s\n",config.hostsocket,context->errstr);
+            redisFree(context);
+            context = NULL;
+            return REDIS_ERR;
+        }
+
+        /* Do AUTH and select the right DB. */
+        if (cliAuth() != REDIS_OK)
+            return REDIS_ERR;
+        if (cliSelect() != REDIS_OK)
+            return REDIS_ERR;

     }
     }

-    switch(type) {
-    case '-':
-        if (config.tty) printf("(error) ");
-        cliReadSingleLineReply(fd,0);
-        return 1;
-    case '+':
-        return cliReadSingleLineReply(fd,0);
-    case ':':
-        if (config.tty) printf("(integer) ");
-        return cliReadSingleLineReply(fd,0);
-    case '$':
-        return cliReadBulkReply(fd);
-    case '*':
-        return cliReadMultiBulkReply(fd);
+    return REDIS_OK;
+}
+
+static void cliPrintContextError() {
+    if (context == NULL) return;
+    fprintf(stderr,"Error: %s\n",context->errstr);
+}
+
+static sds cliFormatReplyTTY(redisReply *r, char *prefix) {
+    sds out = sdsempty();
+    switch (r->type) {
+    case REDIS_REPLY_ERROR:
+        out = sdscatprintf(out,"(error) %s\n", r->str);
+    break;
+    case REDIS_REPLY_STATUS:
+        out = sdscat(out,r->str);
+        out = sdscat(out,"\n");
+    break;
+    case REDIS_REPLY_INTEGER:
+        out = sdscatprintf(out,"(integer) %lld\n",r->integer);
+    break;
+    case REDIS_REPLY_STRING:
+        /* If you are producing output for the standard output we want
+        * a more interesting output with quoted characters and so forth */
+        out = sdscatrepr(out,r->str,r->len);
+        out = sdscat(out,"\n");
+    break;
+    case REDIS_REPLY_NIL:
+        out = sdscat(out,"(nil)\n");
+    break;
+    case REDIS_REPLY_ARRAY:
+        if (r->elements == 0) {
+            out = sdscat(out,"(empty list or set)\n");
+        } else {
+            unsigned int i, idxlen = 0;
+            char _prefixlen[16];
+            char _prefixfmt[16];
+            sds _prefix;
+            sds tmp;
+
+            /* Calculate chars needed to represent the largest index */
+            i = r->elements;
+            do {
+                idxlen++;
+                i /= 10;
+            } while(i);
+
+            /* Prefix for nested multi bulks should grow with idxlen+2 spaces */
+            memset(_prefixlen,' ',idxlen+2);
+            _prefixlen[idxlen+2] = '\0';
+            _prefix = sdscat(sdsnew(prefix),_prefixlen);
+
+            /* Setup prefix format for every entry */
+            snprintf(_prefixfmt,sizeof(_prefixfmt),"%%s%%%dd) ",idxlen);
+
+            for (i = 0; i < r->elements; i++) {
+                /* Don't use the prefix for the first element, as the parent
+                 * caller already prepended the index number. */
+                out = sdscatprintf(out,_prefixfmt,i == 0 ? "" : prefix,i+1);
+
+                /* Format the multi bulk entry */
+                tmp = cliFormatReplyTTY(r->element[i],_prefix);
+                out = sdscatlen(out,tmp,sdslen(tmp));
+                sdsfree(tmp);
+            }
+            sdsfree(_prefix);
+        }
+    break;

     default:
     default:

-        printf("protocol error, got '%c' as reply type byte", type);
-        return 1;
+        fprintf(stderr,"Unknown reply type: %d\n", r->type);
+        exit(1);

     }
     }

+    return out;

 }
 
 }
 

-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) {
-        return retval;
+static sds cliFormatReplyRaw(redisReply *r) {
+    sds out = sdsempty(), tmp;
+    size_t i;
+
+    switch (r->type) {
+    case REDIS_REPLY_NIL:
+        /* Nothing... */
+        break;
+    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);
+        break;
+    case REDIS_REPLY_INTEGER:
+        out = sdscatprintf(out,"%lld",r->integer);
+        break;
+    case REDIS_REPLY_ARRAY:
+        for (i = 0; i < r->elements; i++) {
+            if (i > 0) out = sdscat(out,config.mb_delim);
+            tmp = cliFormatReplyRaw(r->element[i]);
+            out = sdscatlen(out,tmp,sdslen(tmp));
+            sdsfree(tmp);
+        }
+        break;
+    default:
+        fprintf(stderr,"Unknown reply type: %d\n", r->type);
+        exit(1);

     }
     }

-    return 0;
+    return out;

 }
 
 }
 

-static void showInteractiveHelp(void) {
-    printf(
-    "\n"
-    "Welcome to redis-cli " REDIS_VERSION "!\n"
-    "Just type any valid Redis command to see a pretty printed output.\n"
-    "\n"
-    "It is possible to quote strings, like in:\n"
-    "  set \"my key\" \"some string \\xff\\n\"\n"
-    "\n"
-    "You can find a list of valid Redis commands at\n"
-    "  http://code.google.com/p/redis/wiki/CommandReference\n"
-    "\n"
-    "Note: redis-cli supports line editing, use up/down arrows for history."
-    "\n\n");
+static int cliReadReply(int output_raw_strings) {
+    void *_reply;
+    redisReply *reply;
+    sds out;
+
+    if (redisGetReply(context,&_reply) != REDIS_OK) {
+        if (config.shutdown)
+            return REDIS_OK;
+        if (config.interactive) {
+            /* Filter cases where we should reconnect */
+            if (context->err == REDIS_ERR_IO && errno == ECONNRESET)
+                return REDIS_ERR;
+            if (context->err == REDIS_ERR_EOF)
+                return REDIS_ERR;
+        }
+        cliPrintContextError();
+        exit(1);
+        return REDIS_ERR; /* avoid compiler warning */
+    }
+
+    reply = (redisReply*)_reply;
+    if (output_raw_strings) {
+        out = cliFormatReplyRaw(reply);
+    } else {
+        if (config.raw_output) {
+            out = cliFormatReplyRaw(reply);
+            out = sdscat(out,"\n");
+        } else {
+            out = cliFormatReplyTTY(reply,"");
+        }
+    }
+    fwrite(out,sdslen(out),1,stdout);
+    sdsfree(out);
+    freeReplyObject(reply);
+    return REDIS_OK;

 }
 
 static int cliSendCommand(int argc, char **argv, int repeat) {
     char *command = argv[0];
 }
 
 static int cliSendCommand(int argc, char **argv, int repeat) {
     char *command = argv[0];

-    int fd, j, retval = 0;
-    sds cmd;
+    size_t *argvlen;
+    int j, output_raw;
+
+    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")))

 
 

-    config.raw_output = !strcasecmp(command,"info");
-    if (!strcasecmp(command,"help")) {
-        showInteractiveHelp();
-        return 0;
+    {
+        output_raw = 1;
+    }
+
+    if (!strcasecmp(command,"help") || !strcasecmp(command,"?")) {
+        cliOutputHelp(--argc, ++argv);
+        return REDIS_OK;

     }
     if (!strcasecmp(command,"shutdown")) config.shutdown = 1;
     if (!strcasecmp(command,"monitor")) config.monitor_mode = 1;
     if (!strcasecmp(command,"subscribe") ||
         !strcasecmp(command,"psubscribe")) config.pubsub_mode = 1;
     }
     if (!strcasecmp(command,"shutdown")) config.shutdown = 1;
     if (!strcasecmp(command,"monitor")) config.monitor_mode = 1;
     if (!strcasecmp(command,"subscribe") ||
         !strcasecmp(command,"psubscribe")) config.pubsub_mode = 1;

-    if ((fd = cliConnect(0)) == -1) return 1;

 
 

-    /* Select db number */
-    retval = selectDb(fd);
-    if (retval) {
-        fprintf(stderr,"Error setting DB num\n");
-        return 1;
-    }
-
-    /* Build the command to send */
-    cmd = sdscatprintf(sdsempty(),"*%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);
-    }
+    /* Setup argument length */
+    argvlen = malloc(argc*sizeof(size_t));
+    for (j = 0; j < argc; j++)
+        argvlen[j] = sdslen(argv[j]);

 
     while(repeat--) {
 
     while(repeat--) {

-        anetWrite(fd,cmd,sdslen(cmd));
+        redisAppendCommandArgv(context,argc,(const char**)argv,argvlen);

         while (config.monitor_mode) {
         while (config.monitor_mode) {

-            if (cliReadSingleLineReply(fd,0)) exit(1);
-            printf("\n");
+            if (cliReadReply(output_raw) != REDIS_OK) exit(1);
+            fflush(stdout);

         }
 
         if (config.pubsub_mode) {
         }
 
         if (config.pubsub_mode) {

-            printf("Reading messages... (press Ctrl-c to quit)\n");
+            if (!config.raw_output)
+                printf("Reading messages... (press Ctrl-C to quit)\n");

             while (1) {
             while (1) {

-                cliReadReply(fd);
-                printf("\n\n");
+                if (cliReadReply(output_raw) != REDIS_OK) exit(1);

             }
         }
 
             }
         }
 

-        retval = cliReadReply(fd);
-        if (!config.raw_output && config.tty) printf("\n");
-        if (retval) return retval;
+        if (cliReadReply(output_raw) != REDIS_OK) {
+            free(argvlen);
+            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 */

     }
     }

-    return 0;
+
+    free(argvlen);
+    return REDIS_OK;

 }
 
 }
 

+/*------------------------------------------------------------------------------
+ * User interface
+ *--------------------------------------------------------------------------- */
+

 static int parseOptions(int argc, char **argv) {
     int i;
 
 static int parseOptions(int argc, char **argv) {
     int i;
 


@@ -329,42 +537,44 @@ static int parseOptions(int argc, char **argv) {
         int lastarg = i==argc-1;
 
         if (!strcmp(argv[i],"-h") && !lastarg) {
         int lastarg = i==argc-1;
 
         if (!strcmp(argv[i],"-h") && !lastarg) {

-            char *ip = zmalloc(32);
-            if (anetResolve(NULL,argv[i+1],ip) == ANET_ERR) {
-                printf("Can't resolve %s\n", argv[i]);
-                exit(1);
-            }
-            config.hostip = ip;
+            sdsfree(config.hostip);
+            config.hostip = sdsnew(argv[i+1]);

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

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

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

+        } else if (!strcmp(argv[i],"-s") && !lastarg) {
+            config.hostsocket = 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],"-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],"-a") && !lastarg) {
             config.auth = argv[i+1];
             i++;
         } else if (!strcmp(argv[i],"-n") && !lastarg) {
             config.dbnum = atoi(argv[i+1]);
             i++;
         } else if (!strcmp(argv[i],"-a") && !lastarg) {
             config.auth = argv[i+1];
             i++;

-        } else if (!strcmp(argv[i],"-i")) {
-            fprintf(stderr,
-"Starting interactive mode using -i is deprecated. Interactive mode is started\n"
-"by default when redis-cli is executed without a command to execute.\n"
-            );
-        } else if (!strcmp(argv[i],"-c")) {
-            fprintf(stderr,
-"Reading last argument from standard input using -c is deprecated.\n"
-"When standard input is connected to a pipe or regular file, it is\n"
-"automatically used as last argument.\n"
-            );
-        } else if (!strcmp(argv[i],"-v")) {
-            printf("redis-cli shipped with Redis version %s\n", REDIS_VERSION);
+        } else if (!strcmp(argv[i],"--raw")) {
+            config.raw_output = 1;
+        } else if (!strcmp(argv[i],"-d") && !lastarg) {
+            sdsfree(config.mb_delim);
+            config.mb_delim = sdsnew(argv[i+1]);
+            i++;
+        } else if (!strcmp(argv[i],"-v") || !strcmp(argv[i], "--version")) {
+            sds version = cliVersion();
+            printf("redis-cli %s\n", version);
+            sdsfree(version);

             exit(0);
         } else {
             break;
             exit(0);
         } else {
             break;


@@ -391,12 +601,36 @@ static sds readArgFromStdin(void) {
 }
 
 static void usage() {
 }
 
 static void usage() {

-    fprintf(stderr, "usage: redis-cli [-iv] [-h host] [-p port] [-a authpw] [-r repeat_times] [-n db_num] cmd arg1 arg2 arg3 ... argN\n");
-    fprintf(stderr, "usage: echo \"argN\" | redis-cli -x [options] cmd arg1 arg2 ... arg(N-1)\n\n");
-    fprintf(stderr, "example: cat /etc/passwd | redis-cli -x set my_passwd\n");
-    fprintf(stderr, "example: redis-cli get my_passwd\n");
-    fprintf(stderr, "example: redis-cli -r 100 lpush mylist x\n");
-    fprintf(stderr, "\nRun in interactive mode: redis-cli -i or just don't pass any command\n");
+    sds version = cliVersion();
+    fprintf(stderr,
+"redis-cli %s\n"
+"\n"
+"Usage: redis-cli [OPTIONS] [cmd [arg [arg ...]]]\n"
+"  -h <hostname>    Server hostname (default: 127.0.0.1)\n"
+"  -p <port>        Server port (default: 6379)\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"
+"  --raw            Use raw formatting for replies (default when STDOUT is not a tty)\n"
+"  --help           Output this help and exit\n"
+"  --version        Output version and exit\n"
+"\n"
+"Examples:\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",
+        version);
+    sdsfree(version);

     exit(1);
 }
 
     exit(1);
 }
 


@@ -413,16 +647,32 @@ 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;
     sds *argv;
 
     config.interactive = 1;

-    while((line = linenoise("redis> ")) != NULL) {
+    linenoiseSetCompletionCallback(completionCallback);
+
+    /* 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");
                 continue;
             if (argv == NULL) {
                 printf("Invalid argument(s)\n");
                 continue;


@@ -431,23 +681,43 @@ static void repl() {
                     strcasecmp(argv[0],"exit") == 0)
                 {
                     exit(0);
                     strcasecmp(argv[0],"exit") == 0)
                 {
                     exit(0);

+                } else if (argc == 3 && !strcasecmp(argv[0],"connect")) {
+                    sdsfree(config.hostip);
+                    config.hostip = sdsnew(argv[1]);
+                    config.hostport = atoi(argv[2]);
+                    cliConnect(1);
+                } else if (argc == 1 && !strcasecmp(argv[0],"clear")) {
+                    linenoiseClearScreen();

                 } else {
                 } else {

-                    int err;
-
-                    if ((err = cliSendCommand(argc, argv, 1)) != 0) {
-                        if (err == ECONNRESET) {
-                            printf("Reconnecting... ");
-                            fflush(stdout);
-                            if (cliConnect(1) == -1) exit(1);
-                            printf("OK\n");
-                            cliSendCommand(argc,argv,1);
-                        }
+                    long long start_time = mstime(), elapsed;
+                    int repeat, skipargs = 0;
+
+                    repeat = atoi(argv[0]);
+                    if (repeat) {
+                        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. */
+                        if (cliSendCommand(argc-skipargs,argv+skipargs,repeat)
+                            != REDIS_OK)
+                            cliPrintContextError();
+                    }
+                    elapsed = mstime()-start_time;
+                    if (elapsed >= 500) {
+                        printf("(%.2fs)\n",(double)elapsed/1000);

                     }
                 }
             }
             /* 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() */


@@ -472,47 +742,35 @@ static int noninteractive(int argc, char **argv) {
 int main(int argc, char **argv) {
     int firstarg;
 
 int main(int argc, char **argv) {
     int firstarg;
 

-    config.hostip = "127.0.0.1";
+    config.hostip = sdsnew("127.0.0.1");

     config.hostport = 6379;
     config.hostport = 6379;

+    config.hostsocket = NULL;

     config.repeat = 1;
     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.raw_output = 0;

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

-    config.historyfile = NULL;
-    config.tty = isatty(fileno(stdout)) || (getenv("FAKETTY") != NULL);
-    config.mb_sep = '\n';
-
-    if (getenv("HOME") != NULL) {
-        config.historyfile = malloc(256);
-        snprintf(config.historyfile,256,"%s/.rediscli_history",getenv("HOME"));
-        linenoiseHistoryLoad(config.historyfile);
-    }
+    config.raw_output = !isatty(fileno(stdout)) && (getenv("FAKETTY") == NULL);
+    config.mb_delim = sdsnew("\n");
+    cliInitHelp();

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

-    if (config.auth != NULL) {
-        char *authargv[2];
-        int dbnum = config.dbnum;
-
-        /* We need to save the real configured database number and set it to
-         * zero here, otherwise cliSendCommand() will try to perform the
-         * SELECT command before the authentication, and it will fail. */
-        config.dbnum = 0;
-        authargv[0] = "AUTH";
-        authargv[1] = config.auth;
-        cliSendCommand(2, convertToSds(2, authargv), 1);
-        config.dbnum = dbnum; /* restore the right DB number */
+    /* Start interactive mode when no command is provided */
+    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();

     }
 
     }
 

-    /* Start interactive mode when no command is provided */
-    if (argc == 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));
 }