fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-17 16:10:50 +00:00
Code Issues Projects Releases Wiki Activity

further optimizations for the multi bulk protocol parsing code when big objects are transmitted to Redis.

Browse Source
This commit is contained in:
antirez 2011-11-03 15:53:40 +01:00
parent 9217095572
commit 826b5beb9c
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/networking.c
View File

@ -767,6 +767,19 @@ int processMultibulkBuffer(redisClient *c) {
}
pos += newline-(c->querybuf+pos)+2;
#if 1
if (ll > 4096) {
/* If we are going to read a large object from network
* try to make it likely that it will start at c->querybuf
* boundary so that we can optimized object creation
* avoiding a large copy of data. */
c->querybuf = sdsrange(c->querybuf,pos,-1);
pos = 0;
}
#endif
/* Hint the sds library about the amount of bytes this string is
* going to contain. */
if (ll > 4096) c->querybuf = sdsMakeRoomFor(c->querybuf,ll+2);
c->bulklen = ll;
}
@ -779,9 +792,10 @@ int processMultibulkBuffer(redisClient *c) {
* instead of creating a new object by *copying* the sds we
* just use the current sds string. */
if (pos == 0 &&
sdslen(c->querybuf) > 4096 &&
/* sdslen(c->querybuf) > 4096 && */
(signed) sdslen(c->querybuf) == c->bulklen+2)
{
// printf("HERE (arg %d)\n",c->argc);
c->argv[c->argc++] = createObject(REDIS_STRING,c->querybuf);
sdsIncrLen(c->querybuf,-2); /* remove CRLF */
c->querybuf = sdsempty();
@ -790,6 +804,7 @@ int processMultibulkBuffer(redisClient *c) {
c->querybuf = sdsMakeRoomFor(c->querybuf,c->bulklen+2);
pos = 0;
} else {
// printf("NOT HERE (arg %d) (pos %d)\n",c->argc, pos);
c->argv[c->argc++] =
createStringObject(c->querybuf+pos,c->bulklen);
pos += c->bulklen+2;
@ -850,14 +865,31 @@ void processInputBuffer(redisClient *c) {
void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) {
redisClient *c = (redisClient*) privdata;
int nread;
int nread, readlen;
size_t qblen;
REDIS_NOTUSED(el);
REDIS_NOTUSED(mask);
readlen = REDIS_IOBUF_LEN;
/* If this is a multi bulk request, and we are processing a bulk reply
* that is large enough, try to maximize the probabilty that the query
* buffer contains excatly the SDS string representing the object, even
* at the risk of requring more read(2) calls. This way the function
* processMultiBulkBuffer() can avoid copying buffers to create the
* Redis Object representing the argument. */
#if 1
if (c->reqtype == REDIS_REQ_MULTIBULK && c->multibulklen && c->bulklen != -1
&& c->bulklen > 4096)
{
int remaining = (unsigned)(c->bulklen+2)-sdslen(c->querybuf);
if (remaining < readlen) readlen = remaining;
}
#endif
qblen = sdslen(c->querybuf);
c->querybuf = sdsMakeRoomFor(c->querybuf, REDIS_IOBUF_LEN);
nread = read(fd, c->querybuf+qblen, REDIS_IOBUF_LEN);
c->querybuf = sdsMakeRoomFor(c->querybuf, readlen);
nread = read(fd, c->querybuf+qblen, readlen);
if (nread == -1) {
if (errno == EAGAIN) {
nread = 0;

4
src/redis-benchmark.c
View File

@ -367,7 +367,7 @@ int parseOptions(int argc, const char **argv) {
if (lastarg) goto invalid;
config.datasize = atoi(argv[++i]);
if (config.datasize < 1) config.datasize=1;
if (config.datasize > 1024*1024) config.datasize = 1024*1024;
if (config.datasize > 1024*1024*1024) config.datasize = 1024*1024*1024;
} else if (!strcmp(argv[i],"-r")) {
if (lastarg) goto invalid;
config.randomkeys = 1;
@ -500,6 +500,7 @@ int main(int argc, const char **argv) {
memset(data,'x',config.datasize);
data[config.datasize] = '\0';
#if 0
benchmark("PING (inline)","PING\r\n",6);
len = redisFormatCommand(&cmd,"PING");
@ -515,6 +516,7 @@ int main(int argc, const char **argv) {
len = redisFormatCommandArgv(&cmd,21,argv,NULL);
benchmark("MSET (10 keys)",cmd,len);
free(cmd);
#endif
len = redisFormatCommand(&cmd,"SET foo:rand:000000000000 %s",data);
benchmark("SET",cmd,len);