Commit 54e8dd11 authored by antirez's avatar antirez
Browse files

Use guide comments to make changes in #5462 more obvious.

parent 0f18d8e0
...@@ -5181,6 +5181,10 @@ try_again: ...@@ -5181,6 +5181,10 @@ try_again:
} }
if (ttl < 1) ttl = 1; if (ttl < 1) ttl = 1;
} }
/* Relocate valid (non expired) keys into the array in successive
* positions to remove holes created by the keys that were present
* in the first lookup but are now expired after the second lookup. */
kv[non_expired++] = kv[j]; kv[non_expired++] = kv[j];
serverAssertWithInfo(c,NULL, serverAssertWithInfo(c,NULL,
...@@ -5209,6 +5213,8 @@ try_again: ...@@ -5209,6 +5213,8 @@ try_again:
if (replace) if (replace)
serverAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"REPLACE",7)); serverAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"REPLACE",7));
} }
/* Fix the actual number of keys we are migrating. */
num_keys = non_expired; num_keys = non_expired;
/* Transfer the query to the other node in 64K chunks. */ /* Transfer the query to the other node in 64K chunks. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment