Merge commit 'e628f94436f2ffb38dd6305f18956f309838a8d6' into redis_6_merge

Former-commit-id: 2941792a85653258a36f8eb02189132ec7835242

src/cluster.cpp

@@ -5048,6 +5048,7 @@ void restoreCommand(client *c) {
     }
     objectSetLRUOrLFU(obj,lfu_freq,lru_idle,lru_clock,1000);
     signalModifiedKey(c->db,c->argv[1]);
+    notifyKeyspaceEvent(NOTIFY_GENERIC,"restore",c->argv[1],c->db->id);
     addReply(c,shared.ok);
     g_pserver->dirty++;
 }
@@ -5396,6 +5397,7 @@ try_again:
                 /* No COPY option: remove the local key, signal the change. */
                 dbDelete(c->db,kv[j]);
                 signalModifiedKey(c->db,kv[j]);
+                notifyKeyspaceEvent(NOTIFY_GENERIC,"del",kv[j],c->db->id);
                 g_pserver->dirty++;
 
                 /* Populate the argument vector to replace the old one. */
@@ -5561,7 +5563,7 @@ void readwriteCommand(client *c) {
  * already "down" but it is fragile to rely on the update of the global state,
  * so we also handle it here.
  *
- * CLUSTER_REDIR_DOWN_STATE and CLUSTER_REDIR_DOWN_RO_STATE if the cluster is 
+ * CLUSTER_REDIR_DOWN_STATE and CLUSTER_REDIR_DOWN_RO_STATE if the cluster is
  * down but the user attempts to execute a command that addresses one or more keys. */
 clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, int argc, int *hashslot, int *error_code) {
     clusterNode *n = NULL;

src/module.cpp

@@ -6363,7 +6363,7 @@ int moduleUnregisterUsedAPI(RedisModule *module) {
         RedisModule *used = (RedisModule*)ln->value;
         listNode *ln = listSearchKey(used->usedby,module);
         if (ln) {
-            listDelNode(module->usingMods,ln);
+            listDelNode(used->usedby,ln);
             count++;
         }
     }

src/redis-cli.c

@@ -6968,4 +6968,5 @@ int main(int argc, char **argv) {
     } else {
         return noninteractive(argc,convertToSds(argc,argv));
     }
-}
+}
+