Commit cef505d7 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo
Browse files

Merge pull request #1646 from raydog/unstable

Change HLL* to PF* in a few spots
parents 4ab162a5 bf066c87
...@@ -458,7 +458,7 @@ void pfaddCommand(redisClient *c) { ...@@ -458,7 +458,7 @@ void pfaddCommand(redisClient *c) {
* exactly. */ * exactly. */
if (stringObjectLen(o) != REDIS_HLL_SIZE) { if (stringObjectLen(o) != REDIS_HLL_SIZE) {
addReplyErrorFormat(c, addReplyErrorFormat(c,
"HLLADD target key must contain a %d bytes string.", "PFADD target key must contain a %d bytes string.",
REDIS_HLL_SIZE); REDIS_HLL_SIZE);
return; return;
} }
...@@ -475,7 +475,7 @@ void pfaddCommand(redisClient *c) { ...@@ -475,7 +475,7 @@ void pfaddCommand(redisClient *c) {
} }
if (updated) { if (updated) {
signalModifiedKey(c->db,c->argv[1]); signalModifiedKey(c->db,c->argv[1]);
notifyKeyspaceEvent(REDIS_NOTIFY_STRING,"hlladd",c->argv[1],c->db->id); notifyKeyspaceEvent(REDIS_NOTIFY_STRING,"pfadd",c->argv[1],c->db->id);
server.dirty++; server.dirty++;
/* Invalidate the cached cardinality. */ /* Invalidate the cached cardinality. */
registers[REDIS_HLL_SIZE-1] |= (1<<7); registers[REDIS_HLL_SIZE-1] |= (1<<7);
...@@ -502,7 +502,7 @@ void pfcountCommand(redisClient *c) { ...@@ -502,7 +502,7 @@ void pfcountCommand(redisClient *c) {
* exactly. */ * exactly. */
if (stringObjectLen(o) != REDIS_HLL_SIZE) { if (stringObjectLen(o) != REDIS_HLL_SIZE) {
addReplyErrorFormat(c, addReplyErrorFormat(c,
"HLLCOUNT target key must contain a %d bytes string.", "PFCOUNT target key must contain a %d bytes string.",
REDIS_HLL_SIZE); REDIS_HLL_SIZE);
return; return;
} }
...@@ -562,7 +562,7 @@ void pfmergeCommand(redisClient *c) { ...@@ -562,7 +562,7 @@ void pfmergeCommand(redisClient *c) {
if (stringObjectLen(o) != REDIS_HLL_SIZE) { if (stringObjectLen(o) != REDIS_HLL_SIZE) {
addReplyErrorFormat(c, addReplyErrorFormat(c,
"HLLADD target key must contain a %d bytes string.", "PFADD target key must contain a %d bytes string.",
REDIS_HLL_SIZE); REDIS_HLL_SIZE);
return; return;
} }
...@@ -602,7 +602,7 @@ void pfmergeCommand(redisClient *c) { ...@@ -602,7 +602,7 @@ void pfmergeCommand(redisClient *c) {
signalModifiedKey(c->db,c->argv[1]); signalModifiedKey(c->db,c->argv[1]);
/* We generate an HLLADD event for HLLMERGE for semantical simplicity /* We generate an HLLADD event for HLLMERGE for semantical simplicity
* since in theory this is a mass-add of elements. */ * since in theory this is a mass-add of elements. */
notifyKeyspaceEvent(REDIS_NOTIFY_STRING,"hlladd",c->argv[1],c->db->id); notifyKeyspaceEvent(REDIS_NOTIFY_STRING,"pfadd",c->argv[1],c->db->id);
server.dirty++; server.dirty++;
addReply(c,shared.ok); addReply(c,shared.ok);
} }
......
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