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

fix the swapdb issue (#620)

Browse Source
This commit is contained in:
Heng Kuang 2023-04-12 15:08:09 -04:00 committed by GitHub
parent f54e3ea367
commit f9ccf90566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/db.cpp
View File

@ -1737,6 +1737,9 @@ int dbSwapDatabases(int id1, int id2) {
id2 < 0 || id2 >= cserver.dbnum) return C_ERR; id2 < 0 || id2 >= cserver.dbnum) return C_ERR;
if (id1 == id2) return C_OK; if (id1 == id2) return C_OK;
std::swap(g_pserver->db[id1], g_pserver->db[id2]); std::swap(g_pserver->db[id1], g_pserver->db[id2]);
//swap db's id too, otherwise db does not match its id
std::swap(g_pserver->db[id1]->id, g_pserver->db[id2]->id);
/* Note that we don't swap blocking_keys, /* Note that we don't swap blocking_keys,
* ready_keys and watched_keys, since we want clients to * ready_keys and watched_keys, since we want clients to
@ -1766,7 +1769,7 @@ int dbSwapDatabases(int id1, int id2) {
/* SWAPDB db1 db2 */ /* SWAPDB db1 db2 */
void swapdbCommand(client *c) { void swapdbCommand(client *c) {
int id1, id2; int id1, id2, oriId;
/* Not allowed in cluster mode: we have just DB 0 there. */ /* Not allowed in cluster mode: we have just DB 0 there. */
if (g_pserver->cluster_enabled) { if (g_pserver->cluster_enabled) {
@ -1783,6 +1786,9 @@ void swapdbCommand(client *c) {
"invalid second DB index") != C_OK) "invalid second DB index") != C_OK)
return; return;
//get client's original db's id
oriId=c->db->id;
/* Swap... */ /* Swap... */
if (dbSwapDatabases(id1,id2) == C_ERR) { if (dbSwapDatabases(id1,id2) == C_ERR) {
addReplyError(c,"DB index is out of range"); addReplyError(c,"DB index is out of range");
@ -1791,6 +1797,10 @@ void swapdbCommand(client *c) {
RedisModuleSwapDbInfo si = {REDISMODULE_SWAPDBINFO_VERSION,(int32_t)id1,(int32_t)id2}; RedisModuleSwapDbInfo si = {REDISMODULE_SWAPDBINFO_VERSION,(int32_t)id1,(int32_t)id2};
moduleFireServerEvent(REDISMODULE_EVENT_SWAPDB,0,&si); moduleFireServerEvent(REDISMODULE_EVENT_SWAPDB,0,&si);
g_pserver->dirty++; g_pserver->dirty++;
//set client's db to original db
c->db=g_pserver->db[oriId];
addReply(c,shared.ok); addReply(c,shared.ok);
} }
} }