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

RESP3: bring RESP2 compatibility to previous changes.

Browse Source
This commit is contained in:
antirez 2018-11-21 16:20:17 +01:00
parent e14aabf936
commit 13966522ea
2 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/networking.c
View File

@ -473,23 +473,25 @@ void setDeferredArrayLen(client *c, void *node, long length) {
} }
void setDeferredMapLen(client *c, void *node, long length) { void setDeferredMapLen(client *c, void *node, long length) {
setDeferredAggregateLen(c,node,length,'%'); int prefix = c->resp == 2 ? '*' : '%';
if (c->resp == 2) length *= 2;
setDeferredAggregateLen(c,node,length,prefix);
} }
void setDeferredSetLen(client *c, void *node, long length) { void setDeferredSetLen(client *c, void *node, long length) {
setDeferredAggregateLen(c,node,length,'~'); int prefix = c->resp == 2 ? '*' : '~';
setDeferredAggregateLen(c,node,length,prefix);
} }
void setDeferredAttributeLen(client *c, void *node, long length) { void setDeferredAttributeLen(client *c, void *node, long length) {
setDeferredAggregateLen(c,node,length,'|'); int prefix = c->resp == 2 ? '*' : '|';
if (c->resp == 2) length *= 2;
setDeferredAggregateLen(c,node,length,prefix);
} }
void setDeferredPushLen(client *c, void *node, long length) { void setDeferredPushLen(client *c, void *node, long length) {
setDeferredAggregateLen(c,node,length,'>'); int prefix = c->resp == 2 ? '*' : '>';
} setDeferredAggregateLen(c,node,length,prefix);
void setDeferredHelloLen(client *c, void *node, long length) {
setDeferredAggregateLen(c,node,length,'@');
} }
/* Add a double as a bulk reply */ /* Add a double as a bulk reply */
@ -497,12 +499,24 @@ void addReplyDouble(client *c, double d) {
if (isinf(d)) { if (isinf(d)) {
/* Libc in odd systems (Hi Solaris!) will format infinite in a /* Libc in odd systems (Hi Solaris!) will format infinite in a
* different way, so better to handle it in an explicit way. */ * different way, so better to handle it in an explicit way. */
addReplyString(c, d > 0 ? ",inf\r\n" : "-inf\r\n", if (c->resp == 2) {
d > 0 ? 6 : 7); addReplyBulkCString(c, d > 0 ? "inf" : "-inf");
} else {
addReplyString(c, d > 0 ? ",inf\r\n" : "-inf\r\n",
d > 0 ? 6 : 7);
}
} else { } else {
char dbuf[MAX_LONG_DOUBLE_CHARS+3]; char dbuf[MAX_LONG_DOUBLE_CHARS+3],
int dlen = snprintf(dbuf,sizeof(dbuf),",%.17g\r\n",d); sbuf[MAX_LONG_DOUBLE_CHARS+32];
addReplyString(c,dbuf,dlen); int dlen, slen;
if (c->resp == 2) {
dlen = snprintf(dbuf,sizeof(dbuf),"%.17g",d);
slen = snprintf(sbuf,sizeof(sbuf),"$%d\r\n%s\r\n",dlen,dbuf);
addReplyString(c,sbuf,slen);
} else {
dlen = snprintf(dbuf,sizeof(dbuf),",%.17g\r\n",d);
addReplyString(c,dbuf,dlen);
}
} }
} }
@ -510,11 +524,17 @@ void addReplyDouble(client *c, double d) {
* of the double instead of exposing the crude behavior of doubles to the * of the double instead of exposing the crude behavior of doubles to the
* dear user. */ * dear user. */
void addReplyHumanLongDouble(client *c, long double d) { void addReplyHumanLongDouble(client *c, long double d) {
char buf[MAX_LONG_DOUBLE_CHARS]; if (c->resp == 2) {
int len = ld2string(buf,sizeof(buf),d,1); robj *o = createStringObjectFromLongDouble(d,1);
addReplyString(c,",",1); addReplyBulk(c,o);
addReplyString(c,buf,len); decrRefCount(o);
addReplyString(c,"\r\n",2); } else {
char buf[MAX_LONG_DOUBLE_CHARS];
int len = ld2string(buf,sizeof(buf),d,1);
addReplyString(c,",",1);
addReplyString(c,buf,len);
addReplyString(c,"\r\n",2);
}
} }
/* Add a long long as integer reply or bulk len / multi bulk count. /* Add a long long as integer reply or bulk len / multi bulk count.
@ -563,6 +583,7 @@ void addReplyArrayLen(client *c, long length) {
void addReplyMapLen(client *c, long length) { void addReplyMapLen(client *c, long length) {
int prefix = c->resp == 2 ? '*' : '%'; int prefix = c->resp == 2 ? '*' : '%';
if (c->resp == 2) length *= 2;
addReplyAggregateLen(c,length,prefix); addReplyAggregateLen(c,length,prefix);
} }
@ -573,6 +594,7 @@ void addReplySetLen(client *c, long length) {
void addReplyAttributeLen(client *c, long length) { void addReplyAttributeLen(client *c, long length) {
int prefix = c->resp == 2 ? '*' : '|'; int prefix = c->resp == 2 ? '*' : '|';
if (c->resp == 2) length *= 2;
addReplyAggregateLen(c,length,prefix); addReplyAggregateLen(c,length,prefix);
} }

1
src/server.h
View File

@ -1431,7 +1431,6 @@ void setDeferredMapLen(client *c, void *node, long length);
void setDeferredSetLen(client *c, void *node, long length); void setDeferredSetLen(client *c, void *node, long length);
void setDeferredAttributeLen(client *c, void *node, long length); void setDeferredAttributeLen(client *c, void *node, long length);
void setDeferredPushLen(client *c, void *node, long length); void setDeferredPushLen(client *c, void *node, long length);
void setDeferredHelloLen(client *c, void *node, long length);
void processInputBuffer(client *c); void processInputBuffer(client *c);
void processInputBufferAndReplicate(client *c); void processInputBufferAndReplicate(client *c);
void acceptHandler(aeEventLoop *el, int fd, void *privdata, int mask); void acceptHandler(aeEventLoop *el, int fd, void *privdata, int mask);