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

try to parse the request in a smarter way to gain speed... work in progress

Browse Source
This commit is contained in:
antirez 2010-09-17 15:25:32 +02:00
parent 2b00385d51
commit 34a719d250
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/networking.c
View File

@ -28,6 +28,7 @@ redisClient *createClient(int fd) {
selectDb(c,0); selectDb(c,0);
c->fd = fd; c->fd = fd;
c->querybuf = sdsempty(); c->querybuf = sdsempty();
c->newline = NULL;
c->argc = 0; c->argc = 0;
c->argv = NULL; c->argv = NULL;
c->bulklen = -1; c->bulklen = -1;
@ -631,6 +632,7 @@ void resetClient(redisClient *c) {
freeClientArgv(c); freeClientArgv(c);
c->bulklen = -1; c->bulklen = -1;
c->multibulk = 0; c->multibulk = 0;
c->newline = NULL;
} }
void closeTimedoutClients(void) { void closeTimedoutClients(void) {
@ -672,13 +674,14 @@ again:
if (c->flags & REDIS_BLOCKED || c->flags & REDIS_IO_WAIT) return; if (c->flags & REDIS_BLOCKED || c->flags & REDIS_IO_WAIT) return;
if (c->bulklen == -1) { if (c->bulklen == -1) {
/* Read the first line of the query */ /* Read the first line of the query */
char *p = strchr(c->querybuf,'\n');
size_t querylen; size_t querylen;
if (p) { if (c->newline) {
char *p = c->newline;
sds query, *argv; sds query, *argv;
int argc, j; int argc, j;
c->newline = NULL;
query = c->querybuf; query = c->querybuf;
c->querybuf = sdsempty(); c->querybuf = sdsempty();
querylen = 1+(p-(query)); querylen = 1+(p-(query));
@ -765,8 +768,14 @@ void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) {
return; return;
} }
if (nread) { if (nread) {
size_t oldlen = sdslen(c->querybuf);
c->querybuf = sdscatlen(c->querybuf, buf, nread); c->querybuf = sdscatlen(c->querybuf, buf, nread);
c->lastinteraction = time(NULL); c->lastinteraction = time(NULL);
/* Scan this new piece of the query for the newline. We do this
* here in order to make sure we perform this scan just one time
* per piece of buffer, leading to an O(N) scan instead of O(N*N) */
if (c->bulklen == -1 && c->newline == NULL)
c->newline = strchr(c->querybuf+oldlen,'\n');
} else { } else {
return; return;
} }

1
src/redis.h
View File

@ -286,6 +286,7 @@ typedef struct redisClient {
int dictid; int dictid;
sds querybuf; sds querybuf;
robj **argv, **mbargv; robj **argv, **mbargv;
char *newline; /* pointing to the detected newline in querybuf */
int argc, mbargc; int argc, mbargc;
long bulklen; /* bulk read len. -1 if not in bulk read mode */ long bulklen; /* bulk read len. -1 if not in bulk read mode */
int multibulk; /* multi bulk command format active */ int multibulk; /* multi bulk command format active */