caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not migrate already expired keys.

Browse Source
This commit is contained in:
WuYunlong 2018-07-21 10:00:32 +08:00
parent 1c95c07596
commit 4017a11144
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cluster.c
View File

@ -5146,6 +5146,8 @@ try_again:
serverAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,dbid)); serverAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,dbid));
} }
int num_keys_non_expired = 0;
/* Create RESTORE payload and generate the protocol to call the command. */ /* Create RESTORE payload and generate the protocol to call the command. */
for (j = 0; j < num_keys; j++) { for (j = 0; j < num_keys; j++) {
long long ttl = 0; long long ttl = 0;
@ -5153,8 +5155,10 @@ try_again:
if (expireat != -1) { if (expireat != -1) {
ttl = expireat-mstime(); ttl = expireat-mstime();
if (ttl < 0) continue;
if (ttl < 1) ttl = 1; if (ttl < 1) ttl = 1;
} }
num_keys_non_expired++;
serverAssertWithInfo(c,NULL, serverAssertWithInfo(c,NULL,
rioWriteBulkCount(&cmd,'*',replace ? 5 : 4)); rioWriteBulkCount(&cmd,'*',replace ? 5 : 4));
@ -5217,9 +5221,9 @@ try_again:
int socket_error = 0; int socket_error = 0;
int del_idx = 1; /* Index of the key argument for the replicated DEL op. */ int del_idx = 1; /* Index of the key argument for the replicated DEL op. */
if (!copy) newargv = zmalloc(sizeof(robj*)*(num_keys+1)); if (!copy) newargv = zmalloc(sizeof(robj*)*(num_keys_non_expired+1));
for (j = 0; j < num_keys; j++) { for (j = 0; j < num_keys_non_expired; j++) {
if (syncReadLine(cs->fd, buf2, sizeof(buf2), timeout) <= 0) { if (syncReadLine(cs->fd, buf2, sizeof(buf2), timeout) <= 0) {
socket_error = 1; socket_error = 1;
break; break;