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

Applied a few modifications to hiredis to tune it for speed (redis-benchmark) and ability to read more deeply nested replies (redis-cli).

Browse Source
This commit is contained in:
antirez 2012-02-19 20:33:59 +01:00
parent b66e5add82
commit 8e65b6a33d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deps/hiredis/hiredis.c vendored
View File

@ -447,9 +447,9 @@ static int processMultiBulkItem(redisReader *r) {
int root = 0; int root = 0;
/* Set error for nested multi bulks with depth > 2 */ /* Set error for nested multi bulks with depth > 2 */
if (r->ridx == 3) { if (r->ridx == 8) {
__redisReaderSetError(r,REDIS_ERR_PROTOCOL, __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
"No support for nested multi bulk replies with depth > 2"); "No support for nested multi bulk replies with depth > 7");
return REDIS_ERR; return REDIS_ERR;
} }
@ -590,6 +590,7 @@ int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
/* Copy the provided buffer. */ /* Copy the provided buffer. */
if (buf != NULL && len >= 1) { if (buf != NULL && len >= 1) {
#if 0
/* Destroy internal buffer when it is empty and is quite large. */ /* Destroy internal buffer when it is empty and is quite large. */
if (r->len == 0 && sdsavail(r->buf) > 16*1024) { if (r->len == 0 && sdsavail(r->buf) > 16*1024) {
sdsfree(r->buf); sdsfree(r->buf);
@ -599,6 +600,7 @@ int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
/* r->buf should not be NULL since we just free'd a larger one. */ /* r->buf should not be NULL since we just free'd a larger one. */
assert(r->buf != NULL); assert(r->buf != NULL);
} }
#endif
newbuf = sdscatlen(r->buf,buf,len); newbuf = sdscatlen(r->buf,buf,len);
if (newbuf == NULL) { if (newbuf == NULL) {
@ -1067,7 +1069,7 @@ int redisSetTimeout(redisContext *c, struct timeval tv) {
* After this function is called, you may use redisContextReadReply to * After this function is called, you may use redisContextReadReply to
* see if there is a reply available. */ * see if there is a reply available. */
int redisBufferRead(redisContext *c) { int redisBufferRead(redisContext *c) {
char buf[2048]; char buf[1024*16];
int nread; int nread;
/* Return early when the context has seen an error. */ /* Return early when the context has seen an error. */

2
deps/hiredis/hiredis.h vendored
View File

@ -123,7 +123,7 @@ typedef struct redisReader {
size_t pos; /* Buffer cursor */ size_t pos; /* Buffer cursor */
size_t len; /* Buffer length */ size_t len; /* Buffer length */
redisReadTask rstack[4]; redisReadTask rstack[9];
int ridx; /* Index of current read task */ int ridx; /* Index of current read task */
void *reply; /* Temporary reply pointer */ void *reply; /* Temporary reply pointer */