/* Redis CLI (command line interface)
*
- * Copyright (c) 200
6-2009, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 200
9-2010, Salvatore Sanfilippo <antirez at gmail dot com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "sds.h"
#include "adlist.h"
#include "zmalloc.h"
+#include "linenoise.h"
#define REDIS_CMD_INLINE 1
#define REDIS_CMD_BULK 2
-#define REDIS_CMD_MULTIBULK 3
+#define REDIS_CMD_MULTIBULK 4
#define REDIS_NOTUSED(V) ((void) V)
char *hostip;
int hostport;
long repeat;
+ int dbnum;
+ int interactive;
+ char *auth;
} config;
struct redisCommand {
};
static struct redisCommand cmdTable[] = {
+ {"auth",2,REDIS_CMD_INLINE},
{"get",2,REDIS_CMD_INLINE},
{"set",3,REDIS_CMD_BULK},
{"setnx",3,REDIS_CMD_BULK},
+ {"append",3,REDIS_CMD_BULK},
+ {"substr",4,REDIS_CMD_INLINE},
{"del",-2,REDIS_CMD_INLINE},
{"exists",2,REDIS_CMD_INLINE},
{"incr",2,REDIS_CMD_INLINE},
{"lpush",3,REDIS_CMD_BULK},
{"rpop",2,REDIS_CMD_INLINE},
{"lpop",2,REDIS_CMD_INLINE},
+ {"brpop",-3,REDIS_CMD_INLINE},
+ {"blpop",-3,REDIS_CMD_INLINE},
{"llen",2,REDIS_CMD_INLINE},
{"lindex",3,REDIS_CMD_INLINE},
{"lset",4,REDIS_CMD_BULK},
{"lrange",4,REDIS_CMD_INLINE},
{"ltrim",4,REDIS_CMD_INLINE},
{"lrem",4,REDIS_CMD_BULK},
+ {"rpoplpush",3,REDIS_CMD_BULK},
{"sadd",3,REDIS_CMD_BULK},
{"srem",3,REDIS_CMD_BULK},
{"smove",4,REDIS_CMD_BULK},
{"sdiffstore",-3,REDIS_CMD_INLINE},
{"smembers",2,REDIS_CMD_INLINE},
{"zadd",4,REDIS_CMD_BULK},
+ {"zincrby",4,REDIS_CMD_BULK},
{"zrem",3,REDIS_CMD_BULK},
{"zremrangebyscore",4,REDIS_CMD_INLINE},
- {"zrange",4,REDIS_CMD_INLINE},
- {"zrangebyscore",4,REDIS_CMD_INLINE},
- {"zrevrange",4,REDIS_CMD_INLINE},
+ {"zmerge",-3,REDIS_CMD_INLINE},
+ {"zmergeweighed",-4,REDIS_CMD_INLINE},
+ {"zrange",-4,REDIS_CMD_INLINE},
+ {"zrank",3,REDIS_CMD_BULK},
+ {"zrevrank",3,REDIS_CMD_BULK},
+ {"zrangebyscore",-4,REDIS_CMD_INLINE},
+ {"zcount",4,REDIS_CMD_INLINE},
+ {"zrevrange",-4,REDIS_CMD_INLINE},
{"zcard",2,REDIS_CMD_INLINE},
{"zscore",3,REDIS_CMD_BULK},
{"incrby",3,REDIS_CMD_INLINE},
{"echo",2,REDIS_CMD_BULK},
{"save",1,REDIS_CMD_INLINE},
{"bgsave",1,REDIS_CMD_INLINE},
+ {"rewriteaof",1,REDIS_CMD_INLINE},
+ {"bgrewriteaof",1,REDIS_CMD_INLINE},
{"shutdown",1,REDIS_CMD_INLINE},
{"lastsave",1,REDIS_CMD_INLINE},
{"type",2,REDIS_CMD_INLINE},
{"debug",-2,REDIS_CMD_INLINE},
{"mset",-3,REDIS_CMD_MULTIBULK},
{"msetnx",-3,REDIS_CMD_MULTIBULK},
+ {"monitor",1,REDIS_CMD_INLINE},
+ {"multi",1,REDIS_CMD_INLINE},
+ {"exec",1,REDIS_CMD_INLINE},
+ {"discard",1,REDIS_CMD_INLINE},
+ {"hset",4,REDIS_CMD_MULTIBULK},
+ {"hmset",-4,REDIS_CMD_MULTIBULK},
+ {"hincrby",4,REDIS_CMD_INLINE},
+ {"hget",3,REDIS_CMD_BULK},
+ {"hdel",3,REDIS_CMD_BULK},
+ {"hlen",2,REDIS_CMD_INLINE},
+ {"hkeys",2,REDIS_CMD_INLINE},
+ {"hvals",2,REDIS_CMD_INLINE},
+ {"hgetall",2,REDIS_CMD_INLINE},
+ {"hexists",3,REDIS_CMD_BULK},
+ {"config",-2,REDIS_CMD_BULK},
+ {"subscribe",-2,REDIS_CMD_INLINE},
+ {"unsubscribe",-1,REDIS_CMD_INLINE},
+ {"publish",3,REDIS_CMD_BULK},
{NULL,0,0}
};
static int cliReadReply(int fd);
+static void usage();
static struct redisCommand *lookupCommand(char *name) {
int j = 0;
static int cliConnect(void) {
char err[ANET_ERR_LEN];
- int fd;
+ static int fd = ANET_ERR;
- fd = anetTcpConnect(err,config.hostip,config.hostport);
if (fd == ANET_ERR) {
- fprintf(stderr,"Connect: %s\n",err);
- return -1;
+ 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);
}
- anetTcpNoDelay(NULL,fd);
return fd;
}
return sdstrim(line,"\r\n");
}
-static int cliReadSingleLineReply(int fd) {
+static int cliReadSingleLineReply(int fd, int quiet) {
sds reply = cliReadLine(fd);
if (reply == NULL) return 1;
- printf("%s\n", reply);
+ if (!quiet)
+ printf("%s\n", reply);
+ sdsfree(reply);
return 0;
}
switch(type) {
case '-':
printf("(error) ");
- cliReadSingleLineReply(fd);
+ cliReadSingleLineReply(fd,0);
return 1;
case '+':
- return cliReadSingleLineReply(fd);
+ return cliReadSingleLineReply(fd,0);
case ':':
printf("(integer) ");
- return cliReadSingleLineReply(fd);
+ return cliReadSingleLineReply(fd,0);
case '$':
return cliReadBulkReply(fd);
case '*':
}
}
-static int cliSendCommand(int argc, char **argv) {
+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;
+ }
+ return 0;
+}
+
+static int cliSendCommand(int argc, char **argv, int repeat) {
struct redisCommand *rc = lookupCommand(argv[0]);
int fd, j, retval = 0;
+ int read_forever = 0;
sds cmd;
if (!rc) {
fprintf(stderr,"Wrong number of arguments for '%s'\n",rc->name);
return 1;
}
+ if (!strcasecmp(rc->name,"monitor")) read_forever = 1;
if ((fd = cliConnect()) == -1) return 1;
- while(config.repeat--) {
+ /* Select db number */
+ retval = selectDb(fd);
+ if (retval) {
+ fprintf(stderr,"Error setting DB num\n");
+ return 1;
+ }
+
+ while(repeat--) {
/* Build the command to send */
cmd = sdsempty();
if (rc->flags & REDIS_CMD_MULTIBULK) {
cmd = sdscatprintf(cmd,"*%d\r\n",argc);
for (j = 0; j < argc; j++) {
- cmd = sdscatprintf(cmd,"$%d\r\n",sdslen(argv[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);
}
for (j = 0; j < argc; j++) {
if (j != 0) cmd = sdscat(cmd," ");
if (j == argc-1 && rc->flags & REDIS_CMD_BULK) {
- cmd = sdscatprintf(cmd,"%d",sdslen(argv[j]));
+ cmd = sdscatprintf(cmd,"%lu",
+ (unsigned long)sdslen(argv[j]));
} else {
cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
}
}
anetWrite(fd,cmd,sdslen(cmd));
sdsfree(cmd);
+
+ while (read_forever) {
+ cliReadSingleLineReply(fd,0);
+ }
+
retval = cliReadReply(fd);
if (retval) {
- close(fd);
return retval;
}
}
- close(fd);
return 0;
}
for (i = 1; i < argc; i++) {
int lastarg = i==argc-1;
-
+
if (!strcmp(argv[i],"-h") && !lastarg) {
char *ip = zmalloc(32);
if (anetResolve(NULL,argv[i+1],ip) == ANET_ERR) {
}
config.hostip = ip;
i++;
+ } else if (!strcmp(argv[i],"-h") && lastarg) {
+ usage();
} else if (!strcmp(argv[i],"-p") && !lastarg) {
config.hostport = atoi(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],"-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")) {
+ config.interactive = 1;
} else {
break;
}
return arg;
}
+static void usage() {
+ fprintf(stderr, "usage: redis-cli [-h host] [-p port] [-a authpw] [-r repeat_times] [-n db_num] [-i] cmd arg1 arg2 arg3 ... argN\n");
+ fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-a authpw] [-p port] [-r repeat_times] [-n db_num] cmd arg1 arg2 ... arg(N-1)\n");
+ fprintf(stderr, "\nIf a pipe from standard input is detected this data is used as last argument.\n\n");
+ fprintf(stderr, "example: cat /etc/passwd | redis-cli 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");
+ exit(1);
+}
+
+/* Turn the plain C strings into Sds strings */
+static char **convertToSds(int count, char** args) {
+ int j;
+ char **sds = zmalloc(sizeof(char*)*count+1);
+
+ for(j = 0; j < count; j++)
+ sds[j] = sdsnew(args[j]);
+
+ return sds;
+}
+
+static void repl() {
+ int size = 4096, max = size >> 1, argc;
+ char *line;
+ char **ap, *args[max];
+
+ while((line = linenoise("redis> ")) != NULL) {
+ if (line[0] != '\0') {
+ linenoiseHistoryAdd(line);
+ argc = 0;
+
+ for (ap = args; (*ap = strsep(&line, " \t")) != NULL;) {
+ if (**ap != '\0') {
+ if (argc >= max) break;
+ if (strcasecmp(*ap,"quit") == 0 || strcasecmp(*ap,"exit") == 0)
+ exit(0);
+ ap++;
+ argc++;
+ }
+ }
+
+ cliSendCommand(argc, convertToSds(argc, args), 1);
+ }
+
+ free(line);
+ }
+
+ exit(0);
+}
+
int main(int argc, char **argv) {
- int firstarg, j;
+ int firstarg;
char **argvcopy;
struct redisCommand *rc;
config.hostip = "127.0.0.1";
config.hostport = 6379;
config.repeat = 1;
+ config.dbnum = 0;
+ config.interactive = 0;
+ config.auth = NULL;
firstarg = parseOptions(argc,argv);
argc -= firstarg;
argv += firstarg;
-
- /* Turn the plain C strings into Sds strings */
- argvcopy = zmalloc(sizeof(char*)*argc+1);
- for(j = 0; j < argc; j++)
- argvcopy[j] = sdsnew(argv[j]);
-
- if (argc < 1) {
- fprintf(stderr, "usage: redis-cli [-h host] [-p port] [-r repeat_times] cmd arg1 arg2 arg3 ... argN\n");
- fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-p port] -r [repeat_times] cmd arg1 arg2 ... arg(N-1)\n");
- fprintf(stderr, "\nIf a pipe from standard input is detected this data is used as last argument.\n\n");
- fprintf(stderr, "example: cat /etc/passwd | redis-cli set my_passwd\n");
- fprintf(stderr, "example: redis-cli get my_passwd\n");
- fprintf(stderr, "example: redis-cli -r 100 lpush mylist x\n");
- exit(1);
+
+ if (config.auth != NULL) {
+ char *authargv[2];
+
+ authargv[0] = "AUTH";
+ authargv[1] = config.auth;
+ cliSendCommand(2, convertToSds(2, authargv), 1);
}
+ if (argc == 0 || config.interactive == 1) repl();
+
+ argvcopy = convertToSds(argc, argv);
+
/* Read the last argument from stdandard input if needed */
if ((rc = lookupCommand(argv[0])) != NULL) {
- if (rc->arity > 0 && argc == rc->arity-1) {
- sds lastarg = readArgFromStdin();
- argvcopy[argc] = lastarg;
- argc++;
- }
+ if (rc->arity > 0 && argc == rc->arity-1) {
+ sds lastarg = readArgFromStdin();
+ argvcopy[argc] = lastarg;
+ argc++;
+ }
}
- return cliSendCommand(argc, argvcopy);
+ return cliSendCommand(argc, argvcopy, config.repeat);
}
projects / redis.git / blobdiff