From 54e8dd11ff4296b6633775c29e62222ed0244960 Mon Sep 17 00:00:00 2001 From: antirez Date: Mon, 22 Oct 2018 17:43:48 +0200 Subject: [PATCH] Use guide comments to make changes in #5462 more obvious. --- src/cluster.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/cluster.c b/src/cluster.c index 7620b178..b253efe1 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -5181,6 +5181,10 @@ try_again: } 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]; serverAssertWithInfo(c,NULL, @@ -5209,6 +5213,8 @@ try_again: if (replace) serverAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"REPLACE",7)); } + + /* Fix the actual number of keys we are migrating. */ num_keys = non_expired; /* Transfer the query to the other node in 64K chunks. */