Add notification support for HFE

src/t_hash.c

@@ -1118,7 +1118,7 @@ void hashTypeSetExDone(HashTypeSetEx *ex) {
         if (ex->c) {
             server.dirty += ex->fieldDeleted + ex->fieldUpdated;
             signalModifiedKey(ex->c, ex->db, ex->key);
-            notifyKeyspaceEvent(NOTIFY_HASH, ex->cmd, ex->key, ex->db->id);
+            notifyKeyspaceEvent(NOTIFY_HASH, "hexpire", ex->key, ex->db->id);
         }
         if (ex->fieldDeleted && hashTypeLength(ex->hashObj, 0) == 0) {
             dbDelete(ex->db,ex->key);
@@ -2947,6 +2947,7 @@ void hpexpiretimeCommand(client *c) {
 void hpersistCommand(client *c) {
     robj *hashObj;
     long numFields = 0, numFieldsAt = 2;
+    int changed = 0; /* Used to determine whether to send a notification. */
 
     /* Read the hash object */
     if ((hashObj = lookupKeyReadOrReply(c, c->argv[1], shared.null[c->resp])) == NULL ||
@@ -3017,8 +3018,8 @@ void hpersistCommand(client *c) {
 
             listpackExPersist(hashObj, field, fptr, vptr);
             addReplyLongLong(c, HFE_PERSIST_OK);
+            changed = 1;
         }
-        return;
     } else if (hashObj->encoding == OBJ_ENCODING_HT) {
         dict *d = hashObj->ptr;
 
@@ -3046,10 +3047,15 @@ void hpersistCommand(client *c) {
 
             hfieldPersist(hashObj, hf);
             addReplyLongLong(c, HFE_PERSIST_OK);
+            changed = 1;
         }
     } else {
         serverPanic("Unknown encoding: %d", hashObj->encoding);
     }
+
+    /* Generates a hpersist event if the expiry time associated with any field
+     * has been successfully deleted. */
+    if (changed) notifyKeyspaceEvent(NOTIFY_HASH,"hpersist",c->argv[1],c->db->id);
 }
 
 /**

tests/unit/pubsub.tcl

@@ -354,14 +354,23 @@ start_server {tags {"pubsub network"}} {
     }
 
     test "Keyspace notifications: hash events test" {
+        r config set hash-max-listpack-entries 1 ;# TODO: removed after hfe listpack is merged
         r config set notify-keyspace-events Kh
         r del myhash
         set rd1 [redis_deferring_client]
         assert_equal {1} [psubscribe $rd1 *]
         r hmset myhash yes 1 no 0
         r hincrby myhash yes 10
+        r hexpire myhash 999999 1 yes
+        r hexpireat myhash [expr {[clock seconds] + 999999}] NX 1 no
+        r hpexpire myhash 5 1 yes
+        r hpersist myhash 1 yes
         assert_equal "pmessage * __keyspace@${db}__:myhash hset" [$rd1 read]
         assert_equal "pmessage * __keyspace@${db}__:myhash hincrby" [$rd1 read]
+        assert_equal "pmessage * __keyspace@${db}__:myhash hexpire" [$rd1 read]
+        assert_equal "pmessage * __keyspace@${db}__:myhash hexpire" [$rd1 read]
+        assert_equal "pmessage * __keyspace@${db}__:myhash hexpire" [$rd1 read]
+        assert_equal "pmessage * __keyspace@${db}__:myhash hpersist" [$rd1 read]
         $rd1 close
     }