summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2018-11-26 18:55:05 +0100
committerantirez <antirez@gmail.com>2018-12-21 11:42:51 +0100
commit3684b3a8927b682f45df2d1a58b0410eee008fae (patch)
tree5cd73a5a81b8a31868bd5ebc2b1e66dbb6267113
parent2305103162da8005860e652b6cc31041576db374 (diff)
downloadredis-3684b3a8927b682f45df2d1a58b0410eee008fae.tar.gz
RESP3: remove certain constants to spot places to fix.
-rw-r--r--src/server.c5
-rw-r--r--src/server.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/server.c b/src/server.c
index b686e2fca..e2534a4d1 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1429,9 +1429,8 @@ void createSharedObjects(void) {
shared.czero = createObject(OBJ_STRING,sdsnew(":0\r\n"));
shared.cone = createObject(OBJ_STRING,sdsnew(":1\r\n"));
shared.cnegone = createObject(OBJ_STRING,sdsnew(":-1\r\n"));
- shared.nullbulk = createObject(OBJ_STRING,sdsnew("$-1\r\n"));
- shared.nullmultibulk = createObject(OBJ_STRING,sdsnew("*-1\r\n"));
- shared.emptymultibulk = createObject(OBJ_STRING,sdsnew("*0\r\n"));
+ shared.emptyarray = createObject(OBJ_STRING,sdsnew("*0\r\n"));
+ shared.null = createObject(OBJ_STRING,sdsnew("_\r\n"));
shared.pong = createObject(OBJ_STRING,sdsnew("+PONG\r\n"));
shared.queued = createObject(OBJ_STRING,sdsnew("+QUEUED\r\n"));
shared.emptyscan = createObject(OBJ_STRING,sdsnew("*2\r\n$1\r\n0\r\n*0\r\n"));
diff --git a/src/server.h b/src/server.h
index 272db6621..2bb7e3650 100644
--- a/src/server.h
+++ b/src/server.h
@@ -782,8 +782,8 @@ struct moduleLoadQueueEntry {
struct sharedObjectsStruct {
robj *crlf, *ok, *err, *emptybulk, *czero, *cone, *cnegone, *pong, *space,
- *colon, *nullbulk, *nullmultibulk, *queued,
- *emptymultibulk, *wrongtypeerr, *nokeyerr, *syntaxerr, *sameobjecterr,
+ *colon, *queued, *null,
+ *emptyarray, *wrongtypeerr, *nokeyerr, *syntaxerr, *sameobjecterr,
*outofrangeerr, *noscripterr, *loadingerr, *slowscripterr, *bgsaveerr,
*masterdownerr, *roslaveerr, *execaborterr, *noautherr, *noreplicaserr,
*busykeyerr, *oomerr, *plus, *messagebulk, *pmessagebulk, *subscribebulk,