summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-04-16 09:10:30 +0200
committerantirez <antirez@gmail.com>2014-04-16 15:09:47 +0200
commita3848a742995c8318611b6ebe3ee07681a6eddb2 (patch)
treede3ef330a500d5c0c2043a2cc7d1cc814d08cdce
parent030336d4ef4b2f6b4a395267a775785066b6b8d4 (diff)
downloadredis-a3848a742995c8318611b6ebe3ee07681a6eddb2.tar.gz
HyperLogLog invalid representation error code set to INVALIDOBJ.
-rw-r--r--src/hyperloglog.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/hyperloglog.c b/src/hyperloglog.c
index 3cb31f296..838c921db 100644
--- a/src/hyperloglog.c
+++ b/src/hyperloglog.c
@@ -202,7 +202,7 @@ struct hllhdr {
#define HLL_SPARSE 1 /* Sparse encoding */
#define HLL_MAX_ENCODING 1
-static char *invalid_hll_err = "Corrupted HLL object detected";
+static char *invalid_hll_err = "-INVALIDOBJ Corrupted HLL object detected\r\n";
/* =========================== Low level bit macros ========================= */
@@ -1086,7 +1086,7 @@ void pfaddCommand(redisClient *c) {
updated++;
break;
case -1:
- addReplyError(c,invalid_hll_err);
+ addReplySds(c,sdsnew(invalid_hll_err));
return;
}
}
@@ -1131,7 +1131,7 @@ void pfcountCommand(redisClient *c) {
/* Recompute it and update the cached value. */
card = hllCount(hdr,&invalid);
if (invalid) {
- addReplyError(c,invalid_hll_err);
+ addReplySds(c,sdsnew(invalid_hll_err));
return;
}
hdr->card[0] = card & 0xff;
@@ -1205,7 +1205,7 @@ void pfmergeCommand(redisClient *c) {
}
}
if (i != HLL_REGISTERS) {
- addReplyError(c,invalid_hll_err);
+ addReplySds(c,sdsnew(invalid_hll_err));
return;
}
}
@@ -1228,7 +1228,7 @@ void pfmergeCommand(redisClient *c) {
/* Only support dense objects as destination. */
if (hllSparseToDense(o) == REDIS_ERR) {
- addReplyError(c,invalid_hll_err);
+ addReplySds(c,sdsnew(invalid_hll_err));
return;
}
@@ -1371,7 +1371,7 @@ void pfdebugCommand(redisClient *c) {
if (hdr->encoding == HLL_SPARSE) {
if (hllSparseToDense(o) == REDIS_ERR) {
- addReplyError(c,invalid_hll_err);
+ addReplySds(c,sdsnew(invalid_hll_err));
return;
}
server.dirty++; /* Force propagation on encoding change. */
@@ -1435,7 +1435,7 @@ void pfdebugCommand(redisClient *c) {
if (hdr->encoding == HLL_SPARSE) {
if (hllSparseToDense(o) == REDIS_ERR) {
- addReplyError(c,invalid_hll_err);
+ addReplySds(c,sdsnew(invalid_hll_err));
return;
}
conv = 1;