mirror of
https://github.com/fluencelabs/redis
synced 2025-03-30 22:31:03 +00:00
added multi-bulk protocol support to redis-cli and support for MSET and MSETNX
This commit is contained in:
parent
2ed22c8b29
commit
8165a5f2a3
30
redis-cli.c
30
redis-cli.c
@ -42,6 +42,7 @@
|
|||||||
|
|
||||||
#define REDIS_CMD_INLINE 1
|
#define REDIS_CMD_INLINE 1
|
||||||
#define REDIS_CMD_BULK 2
|
#define REDIS_CMD_BULK 2
|
||||||
|
#define REDIS_CMD_MULTIBULK 3
|
||||||
|
|
||||||
#define REDIS_NOTUSED(V) ((void) V)
|
#define REDIS_NOTUSED(V) ((void) V)
|
||||||
|
|
||||||
@ -113,6 +114,8 @@ static struct redisCommand cmdTable[] = {
|
|||||||
{"ttl",2,REDIS_CMD_INLINE},
|
{"ttl",2,REDIS_CMD_INLINE},
|
||||||
{"slaveof",3,REDIS_CMD_INLINE},
|
{"slaveof",3,REDIS_CMD_INLINE},
|
||||||
{"debug",-2,REDIS_CMD_INLINE},
|
{"debug",-2,REDIS_CMD_INLINE},
|
||||||
|
{"mset",-3,REDIS_CMD_MULTIBULK},
|
||||||
|
{"msetnx",-3,REDIS_CMD_MULTIBULK},
|
||||||
{NULL,0,0}
|
{NULL,0,0}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -255,18 +258,27 @@ static int cliSendCommand(int argc, char **argv) {
|
|||||||
if ((fd = cliConnect()) == -1) return 1;
|
if ((fd = cliConnect()) == -1) return 1;
|
||||||
|
|
||||||
/* Build the command to send */
|
/* Build the command to send */
|
||||||
for (j = 0; j < argc; j++) {
|
if (rc->flags & REDIS_CMD_MULTIBULK) {
|
||||||
if (j != 0) cmd = sdscat(cmd," ");
|
cmd = sdscatprintf(cmd,"*%d\r\n",argc);
|
||||||
if (j == argc-1 && rc->flags & REDIS_CMD_BULK) {
|
for (j = 0; j < argc; j++) {
|
||||||
cmd = sdscatprintf(cmd,"%d",sdslen(argv[j]));
|
cmd = sdscatprintf(cmd,"$%d\r\n",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 = sdscat(cmd,"\r\n");
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
anetWrite(fd,cmd,sdslen(cmd));
|
anetWrite(fd,cmd,sdslen(cmd));
|
||||||
retval = cliReadReply(fd);
|
retval = cliReadReply(fd);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user