int hostport;
char *hostsocket;
long repeat;
+ long interval;
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 latency_mode;
int stdinarg; /* get last arg from stdin. (-x option) */
- char mb_sep;
char *auth;
- char *historyfile;
+ int raw_output; /* output mode per command */
+ sds mb_delim;
+ char prompt[32];
} config;
static void usage();
char *redisGitSHA1(void);
+char *redisGitDirty(void);
/*------------------------------------------------------------------------------
* Utility functions
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
*--------------------------------------------------------------------------- */
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 version;
+}
+
static void cliInitHelp() {
int commandslen = sizeof(commandHelp)/sizeof(struct commandHelp);
int groupslen = sizeof(commandGroups)/sizeof(char*);
/* 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",
- REDIS_VERSION
+ version
);
+ sdsfree(version);
}
/* Output all command help, filtering by group or command name. */
/* Send SELECT dbnum to the server */
static int cliSelect() {
redisReply *reply;
- char dbnum[16];
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;
return REDIS_OK;
}
-static void cliPrintContextErrorAndExit() {
+static void cliPrintContextError() {
if (context == NULL) return;
fprintf(stderr,"Error: %s\n",context->errstr);
- exit(1);
}
-static sds cliFormatReply(redisReply *r, char *prefix) {
+static sds cliFormatReplyTTY(redisReply *r, char *prefix) {
sds out = sdsempty();
switch (r->type) {
case REDIS_REPLY_ERROR:
- if (config.tty) out = sdscat(out,"(error) ");
- out = sdscatprintf(out,"%s\n", r->str);
+ 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:
- if (config.tty) out = sdscat(out,"(integer) ");
- out = sdscatprintf(out,"%lld\n",r->integer);
+ out = sdscatprintf(out,"(integer) %lld\n",r->integer);
break;
case REDIS_REPLY_STRING:
- if (config.raw_output || !config.tty) {
- out = sdscatlen(out,r->str,r->len);
- } else {
- /* 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");
- }
+ /* 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");
out = sdscatprintf(out,_prefixfmt,i == 0 ? "" : prefix,i+1);
/* Format the multi bulk entry */
- tmp = cliFormatReply(r->element[i],_prefix);
+ tmp = cliFormatReplyTTY(r->element[i],_prefix);
out = sdscatlen(out,tmp,sdslen(tmp));
sdsfree(tmp);
}
return out;
}
-static int cliReadReply() {
+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 out;
+}
+
+static int cliReadReply(int output_raw_strings) {
+ void *_reply;
redisReply *reply;
sds out;
- if (redisGetReply(context,(void**)&reply) != REDIS_OK) {
+ if (redisGetReply(context,&_reply) != REDIS_OK) {
if (config.shutdown)
return REDIS_OK;
if (config.interactive) {
if (context->err == REDIS_ERR_EOF)
return REDIS_ERR;
}
- cliPrintContextErrorAndExit();
+ cliPrintContextError();
+ exit(1);
return REDIS_ERR; /* avoid compiler warning */
}
- out = cliFormatReply(reply,"");
- freeReplyObject(reply);
+ 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];
size_t *argvlen;
- int j;
+ 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;
}
- config.raw_output = !strcasecmp(command,"info");
if (!strcasecmp(command,"help") || !strcasecmp(command,"?")) {
cliOutputHelp(--argc, ++argv);
return REDIS_OK;
while(repeat--) {
redisAppendCommandArgv(context,argc,(const char**)argv,argvlen);
while (config.monitor_mode) {
- if (cliReadReply() != REDIS_OK) exit(1);
+ if (cliReadReply(output_raw) != REDIS_OK) exit(1);
fflush(stdout);
}
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) {
- if (cliReadReply() != REDIS_OK) exit(1);
+ if (cliReadReply(output_raw) != REDIS_OK) exit(1);
}
}
- if (cliReadReply() != REDIS_OK)
+ 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 */
}
+
+ free(argvlen);
return REDIS_OK;
}
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) {
} 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],"-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 (%s)\n", REDIS_VERSION, redisGitSHA1());
+ } 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],"-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;
}
static void usage() {
- fprintf(stderr, "usage: redis-cli [-iv] [-h host] [-p port] [-s /path/to/socket] [-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"
+" --latency Enter a special mode continuously sampling latency.\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);
}
#define LINE_BUFLEN 4096
static void repl() {
- int argc, j;
+ sds historyfile = NULL;
+ int history = 0;
char *line;
+ int argc;
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);
- 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;
linenoiseClearScreen();
} else {
long long start_time = mstime(), elapsed;
+ int repeat, skipargs = 0;
+
+ repeat = atoi(argv[0]);
+ if (argc > 1 && repeat) {
+ skipargs = 1;
+ } else {
+ repeat = 1;
+ }
- if (cliSendCommand(argc,argv,1) != REDIS_OK) {
+ if (cliSendCommand(argc-skipargs,argv+skipargs,repeat)
+ != REDIS_OK)
+ {
cliConnect(1);
- /* If we still cannot send the command,
- * print error and abort. */
- if (cliSendCommand(argc,argv,1) != REDIS_OK)
- cliPrintContextErrorAndExit();
+ /* 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) {
}
}
/* 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() */
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;
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.raw_output = 0;
+ config.latency_mode = 0;
config.stdinarg = 0;
config.auth = NULL;
- config.historyfile = NULL;
- config.tty = isatty(fileno(stdout)) || (getenv("FAKETTY") != NULL);
- config.mb_sep = '\n';
+ 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;
- /* 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 */
- 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 */
+ if (cliConnect(0) != REDIS_OK) exit(1);
return noninteractive(argc,convertToSds(argc,argv));
}
projects / redis.git / blobdiff