fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-01 15:21:03 +00:00
Code Issues Projects Releases Wiki Activity

multi bulk input protocol fixed

Browse Source
This commit is contained in:
antirez 2009-10-16 23:36:33 +02:00
parent f6b141c57d
commit 638e42aca4
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
redis.c
View File

@ -344,6 +344,7 @@ static int processCommand(redisClient *c);
static void setupSigSegvAction(void); static void setupSigSegvAction(void);
static void rdbRemoveTempFile(pid_t childpid); static void rdbRemoveTempFile(pid_t childpid);
static size_t stringObjectLen(robj *o); static size_t stringObjectLen(robj *o);
static void processInputBuffer(redisClient *c);
static void authCommand(redisClient *c); static void authCommand(redisClient *c);
static void pingCommand(redisClient *c); static void pingCommand(redisClient *c);
@ -1359,6 +1360,10 @@ static int processCommand(redisClient *c) {
} }
c->argc--; c->argc--;
c->bulklen = bulklen+2; /* add two bytes for CR+LF */ c->bulklen = bulklen+2; /* add two bytes for CR+LF */
/*
if (sdslen(c->querybuf) > 0)
processInputBuffer(c);
*/
return 1; return 1;
} }
} else { } else {
@ -1389,6 +1394,10 @@ static int processCommand(redisClient *c) {
/* continue below and process the command */ /* continue below and process the command */
} else { } else {
c->bulklen = -1; c->bulklen = -1;
/*
if (sdslen(c->querybuf) > 0)
processInputBuffer(c);
*/
return 1; return 1;
} }
} }
@ -1542,34 +1551,7 @@ static void replicationFeedSlaves(list *slaves, struct redisCommand *cmd, int di
if (outv != static_outv) zfree(outv); if (outv != static_outv) zfree(outv);
} }
static void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) { static void processInputBuffer(redisClient *c) {
redisClient *c = (redisClient*) privdata;
char buf[REDIS_IOBUF_LEN];
int nread;
REDIS_NOTUSED(el);
REDIS_NOTUSED(mask);
nread = read(fd, buf, REDIS_IOBUF_LEN);
if (nread == -1) {
if (errno == EAGAIN) {
nread = 0;
} else {
redisLog(REDIS_DEBUG, "Reading from client: %s",strerror(errno));
freeClient(c);
return;
}
} else if (nread == 0) {
redisLog(REDIS_DEBUG, "Client closed connection");
freeClient(c);
return;
}
if (nread) {
c->querybuf = sdscatlen(c->querybuf, buf, nread);
c->lastinteraction = time(NULL);
} else {
return;
}
again: again:
if (c->bulklen == -1) { if (c->bulklen == -1) {
/* Read the first line of the query */ /* Read the first line of the query */
@ -1636,12 +1618,45 @@ again:
c->argv[c->argc] = createStringObject(c->querybuf,c->bulklen-2); c->argv[c->argc] = createStringObject(c->querybuf,c->bulklen-2);
c->argc++; c->argc++;
c->querybuf = sdsrange(c->querybuf,c->bulklen,-1); c->querybuf = sdsrange(c->querybuf,c->bulklen,-1);
processCommand(c); /* Process the command. If the client is still valid after
* the processing and there is more data in the buffer
* try to parse it. */
if (processCommand(c) && sdslen(c->querybuf)) goto again;
return; return;
} }
} }
} }
static void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) {
redisClient *c = (redisClient*) privdata;
char buf[REDIS_IOBUF_LEN];
int nread;
REDIS_NOTUSED(el);
REDIS_NOTUSED(mask);
nread = read(fd, buf, REDIS_IOBUF_LEN);
if (nread == -1) {
if (errno == EAGAIN) {
nread = 0;
} else {
redisLog(REDIS_DEBUG, "Reading from client: %s",strerror(errno));
freeClient(c);
return;
}
} else if (nread == 0) {
redisLog(REDIS_DEBUG, "Client closed connection");
freeClient(c);
return;
}
if (nread) {
c->querybuf = sdscatlen(c->querybuf, buf, nread);
c->lastinteraction = time(NULL);
} else {
return;
}
processInputBuffer(c);
}
static int selectDb(redisClient *c, int id) { static int selectDb(redisClient *c, int id) {
if (id < 0 || id >= server.dbnum) if (id < 0 || id >= server.dbnum)
return REDIS_ERR; return REDIS_ERR;