caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

redis-cli now accepts a -r (repeat) switch. Still there is a memory leaks to fix

Browse Source
This commit is contained in:
antirez 2009-11-03 01:35:39 +01:00
parent cdd140aa67
commit 5762b7f0f8
1 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
redis-cli.c
View File

@ -49,6 +49,7 @@
static struct config { static struct config {
char *hostip; char *hostip;
int hostport; int hostport;
long repeat;
} config; } config;
struct redisCommand { struct redisCommand {
@ -255,7 +256,7 @@ static int cliReadReply(int fd) {
static int cliSendCommand(int argc, char **argv) { static int cliSendCommand(int argc, char **argv) {
struct redisCommand *rc = lookupCommand(argv[0]); struct redisCommand *rc = lookupCommand(argv[0]);
int fd, j, retval = 0; int fd, j, retval = 0;
sds cmd = sdsempty(); sds cmd;
if (!rc) { if (!rc) {
fprintf(stderr,"Unknown command '%s'\n",argv[0]); fprintf(stderr,"Unknown command '%s'\n",argv[0]);
@ -269,35 +270,39 @@ static int cliSendCommand(int argc, char **argv) {
} }
if ((fd = cliConnect()) == -1) return 1; if ((fd = cliConnect()) == -1) return 1;
/* Build the command to send */ while(config.repeat--) {
if (rc->flags & REDIS_CMD_MULTIBULK) { /* Build the command to send */
cmd = sdscatprintf(cmd,"*%d\r\n",argc); cmd = sdsempty();
for (j = 0; j < argc; j++) { if (rc->flags & REDIS_CMD_MULTIBULK) {
cmd = sdscatprintf(cmd,"$%d\r\n",sdslen(argv[j])); cmd = sdscatprintf(cmd,"*%d\r\n",argc);
cmd = sdscatlen(cmd,argv[j],sdslen(argv[j])); for (j = 0; j < argc; j++) {
cmd = sdscatlen(cmd,"\r\n",2); cmd = sdscatprintf(cmd,"$%d\r\n",sdslen(argv[j]));
}
} else {
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]));
} else {
cmd = sdscatlen(cmd,argv[j],sdslen(argv[j])); cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
cmd = sdscatlen(cmd,"\r\n",2);
}
} else {
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]));
} else {
cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
}
}
cmd = sdscat(cmd,"\r\n");
if (rc->flags & REDIS_CMD_BULK) {
cmd = sdscatlen(cmd,argv[argc-1],sdslen(argv[argc-1]));
cmd = sdscatlen(cmd,"\r\n",2);
} }
} }
cmd = sdscat(cmd,"\r\n"); anetWrite(fd,cmd,sdslen(cmd));
if (rc->flags & REDIS_CMD_BULK) { sdsfree(cmd);
cmd = sdscatlen(cmd,argv[argc-1],sdslen(argv[argc-1])); retval = cliReadReply(fd);
cmd = sdscatlen(cmd,"\r\n",2); if (retval) {
close(fd);
return retval;
} }
} }
anetWrite(fd,cmd,sdslen(cmd));
retval = cliReadReply(fd);
if (retval) {
close(fd);
return retval;
}
close(fd); close(fd);
return 0; return 0;
} }
@ -319,6 +324,9 @@ static int parseOptions(int argc, char **argv) {
} else if (!strcmp(argv[i],"-p") && !lastarg) { } else if (!strcmp(argv[i],"-p") && !lastarg) {
config.hostport = atoi(argv[i+1]); config.hostport = atoi(argv[i+1]);
i++; i++;
} else if (!strcmp(argv[i],"-r") && !lastarg) {
config.repeat = strtoll(argv[i+1],NULL,10);
i++;
} else { } else {
break; break;
} }
@ -350,6 +358,7 @@ int main(int argc, char **argv) {
config.hostip = "127.0.0.1"; config.hostip = "127.0.0.1";
config.hostport = 6379; config.hostport = 6379;
config.repeat = 1;
firstarg = parseOptions(argc,argv); firstarg = parseOptions(argc,argv);
argc -= firstarg; argc -= firstarg;
@ -361,11 +370,12 @@ int main(int argc, char **argv) {
argvcopy[j] = sdsnew(argv[j]); argvcopy[j] = sdsnew(argv[j]);
if (argc < 1) { if (argc < 1) {
fprintf(stderr, "usage: redis-cli [-h host] [-p port] cmd arg1 arg2 arg3 ... argN\n"); 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] cmd arg1 arg2 ... arg(N-1)\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, "\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: cat /etc/passwd | redis-cli set my_passwd\n");
fprintf(stderr, "example: redis-cli get 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); exit(1);
} }