gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'e628f94436f2ffb38dd6305f18956f309838a8d6' into redis_6_merge

Browse Source 
Former-commit-id: 2941792a85653258a36f8eb02189132ec7835242
This commit is contained in:
John Sully 2020-04-14 21:13:42 -04:00
commit 7a6933bb15
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster.cpp
View File

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

2
src/module.cpp
View File

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

3
src/redis-cli.c
View File

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