Commit b892cabe authored by antirez's avatar antirez
Browse files

redis-benchmark hopefully last bug with multi bulk reply fixed

parent 58cd7103
...@@ -365,9 +365,7 @@ static void createMissingClients(client c) { ...@@ -365,9 +365,7 @@ static void createMissingClients(client c) {
sdsfree(new->obuf); sdsfree(new->obuf);
new->obuf = sdsdup(c->obuf); new->obuf = sdsdup(c->obuf);
if (config.randomkeys) randomizeClientKey(c); if (config.randomkeys) randomizeClientKey(c);
new->replytype = c->replytype; prepareClientForReply(new,c->replytype);
if (c->replytype == REPLY_BULK)
new->readlen = -1;
} }
} }
......
...@@ -1385,6 +1385,7 @@ static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) ...@@ -1385,6 +1385,7 @@ static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask)
/* Use writev() if we have enough buffers to send */ /* Use writev() if we have enough buffers to send */
#if 0
if (!server.glueoutputbuf && if (!server.glueoutputbuf &&
listLength(c->reply) > REDIS_WRITEV_THRESHOLD && listLength(c->reply) > REDIS_WRITEV_THRESHOLD &&
!(c->flags & REDIS_MASTER)) !(c->flags & REDIS_MASTER))
...@@ -1392,6 +1393,7 @@ static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) ...@@ -1392,6 +1393,7 @@ static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask)
sendReplyToClientWritev(el, fd, privdata, mask); sendReplyToClientWritev(el, fd, privdata, mask);
return; return;
} }
#endif
while(listLength(c->reply)) { while(listLength(c->reply)) {
if (server.glueoutputbuf && listLength(c->reply) > 1) if (server.glueoutputbuf && listLength(c->reply) > 1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment