#include "sds.h"
#include "adlist.h"
#include "zmalloc.h"
+#include "linenoise.h"
#define REDIS_CMD_INLINE 1
#define REDIS_CMD_BULK 2
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},
{"zincrby",4,REDIS_CMD_BULK},
{"zrem",3,REDIS_CMD_BULK},
{"zremrangebyscore",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},
{"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},
+ {"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 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;
}
if (type <= 0 || type != '+') return 1;
retval = cliReadSingleLineReply(fd,1);
if (retval) {
- close(fd);
return retval;
}
return 0;
}
-static int cliSendCommand(int argc, char **argv) {
+static int cliSendCommand(int argc, char **argv, int repeat) {
struct redisCommand *rc = lookupCommand(argv[0]);
int fd, j, retval = 0;
int read_forever = 0;
return 1;
}
- while(config.repeat--) {
+ while(repeat--) {
/* Build the command to send */
cmd = sdsempty();
if (rc->flags & REDIS_CMD_MULTIBULK) {
retval = cliReadReply(fd);
if (retval) {
- close(fd);
return retval;
}
}
- close(fd);
return 0;
}
} 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 {
}
static void usage() {
- fprintf(stderr, "usage: redis-cli [-h host] [-p port] [-r repeat_times] [-n db_num] [-i] cmd arg1 arg2 arg3 ... argN\n");
- fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-p port] [-r repeat_times] [-n db_num] cmd arg1 arg2 ... arg(N-1)\n");
+ 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 \n");
+ fprintf(stderr, "\nRun in interactive mode: redis-cli -i or just don't pass any command\n");
exit(1);
}
return sds;
}
-static char *prompt(char *line, int size) {
- char *retval;
-
- do {
- printf(">> ");
- retval = fgets(line, size, stdin);
- } while (retval && *line == '\n');
-
- line[strlen(line) - 1] = '\0';
-
- fpurge(stdin);
-
- return retval;
-}
-
static void repl() {
int size = 4096, max = size >> 1, argc;
- char buffer[size];
- char *line = buffer;
+ char *line;
char **ap, *args[max];
- while (prompt(line, size)) {
- argc = 0;
-
- for (ap = args; (*ap = strsep(&line, " \t")) != NULL;) {
- if (**ap != '\0') {
- if (argc >= max) break;
- ap++;
- argc++;
- }
+ 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);
}
- config.repeat = 1;
- cliSendCommand(argc, convertToSds(argc, args));
- line = buffer;
+ free(line);
}
exit(0);
config.repeat = 1;
config.dbnum = 0;
config.interactive = 0;
+ config.auth = NULL;
firstarg = parseOptions(argc,argv);
-
argc -= firstarg;
argv += firstarg;
- if (config.interactive == 1) repl();
- if (argc < 1) usage();
+ 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);
}
}
- return cliSendCommand(argc, argvcopy);
+ return cliSendCommand(argc, argvcopy, config.repeat);
}
projects / redis.git / blobdiff