From e197926c80e39eb77f03403057e95e479cdfe69e Mon Sep 17 00:00:00 2001 From: Meng Xu Date: Wed, 12 Dec 2018 15:21:33 -0800 Subject: [PATCH] TeamCollection: Remove a duplicate function Remove a duplicate function that has different signature. No functionality change. Signed-off-by: Meng Xu --- fdbserver/DataDistribution.actor.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp index 71cc9f624b..8e346b8c9d 100644 --- a/fdbserver/DataDistribution.actor.cpp +++ b/fdbserver/DataDistribution.actor.cpp @@ -1874,12 +1874,6 @@ struct DDTeamCollection : ReferenceCounted { return machineInfo; } - Reference checkAndCreateMachineByServerID(UID& id) { - ASSERT(server_info.find(id) != server_info.end()); - Reference server = server_info[id]; - return checkAndCreateMachine(server); - } - // Check if the serverTeam belongs to a machine team; If not, create the machine team Reference checkAndCreateMachineTeam(Reference serverTeam) { std::vector> machineIDs; @@ -2653,8 +2647,9 @@ ACTOR Future storageServerTracker( for (int i = 0; i < machine->serversOnMachine.size(); ++i) { if (machine->serversOnMachine[i].getPtr() == server) { serverIndex = i; - machine->serversOnMachine[i--] = machine->serversOnMachine.back(); + machine->serversOnMachine[i] = machine->serversOnMachine.back(); machine->serversOnMachine.pop_back(); + break; // Invariant: server only appear on the machine once } } ASSERT(serverIndex != -1); @@ -2666,7 +2661,7 @@ ACTOR Future storageServerTracker( // Second handle the impact on the destination machine where the server's new locality is; // If the destination machine is new, create one; otherwise, add server to an existing one // Update server's machine reference to the destination machine - Reference destMachine = self->checkAndCreateMachineByServerID(server->id); + Reference destMachine = self->checkAndCreateMachine(self->server_info[server->id]); ASSERT(destMachine.isValid()); // Ensure the server's server team belong to a machine team, and