From dd5cd762a81886036a9edb5cde506c63420c5ebf Mon Sep 17 00:00:00 2001 From: sfc-gh-tclinkenbeard Date: Sat, 4 Jul 2020 00:04:32 -0700 Subject: [PATCH] Removed dead code --- fdbclient/BlobStore.actor.cpp | 1 - fdbrpc/FlowTransport.actor.cpp | 4 ---- fdbrpc/FlowTransport.h | 3 --- fdbserver/DBCoreState.h | 6 ------ fdbserver/fdbserver.actor.cpp | 1 - 5 files changed, 15 deletions(-) diff --git a/fdbclient/BlobStore.actor.cpp b/fdbclient/BlobStore.actor.cpp index ec27791e15..53b428e907 100644 --- a/fdbclient/BlobStore.actor.cpp +++ b/fdbclient/BlobStore.actor.cpp @@ -971,7 +971,6 @@ void BlobStoreEndpoint::setAuthHeaders(std::string const &verb, std::string cons date = dateBuf; std::string msg; - StringRef x; msg.append(verb); msg.append("\n"); auto contentMD5 = headers.find("Content-MD5"); diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp index 7c9e3ed912..8b594ed519 100644 --- a/fdbrpc/FlowTransport.actor.cpp +++ b/fdbrpc/FlowTransport.actor.cpp @@ -1435,10 +1435,6 @@ Reference FlowTransport::sendUnreliable( ISerializeSource const& what, con return peer; } -int FlowTransport::getEndpointCount() { - return -1; -} - Reference> FlowTransport::getDegraded() { return self->degraded; } diff --git a/fdbrpc/FlowTransport.h b/fdbrpc/FlowTransport.h index 0f7326b35e..fce0f61a9a 100644 --- a/fdbrpc/FlowTransport.h +++ b/fdbrpc/FlowTransport.h @@ -215,9 +215,6 @@ public: Reference sendUnreliable( ISerializeSource const& what, const Endpoint& destination, bool openConnection );// { cancelReliable(sendReliable(what,destination)); } - int getEndpointCount(); - // for tracing only - bool incompatibleOutgoingConnectionsPresent(); static FlowTransport& transport() { return *static_cast((void*) g_network->global(INetwork::enFlowTransport)); } diff --git a/fdbserver/DBCoreState.h b/fdbserver/DBCoreState.h index 754e65d944..5b478341f3 100644 --- a/fdbserver/DBCoreState.h +++ b/fdbserver/DBCoreState.h @@ -152,12 +152,6 @@ struct DBCoreState { template void serialize(Archive& ar) { - //FIXME: remove when we no longer need to test upgrades from 4.X releases - if(g_network->isSimulated() && !ar.protocolVersion().hasMultiGenerationTLog()) { - TraceEvent("ElapsedTime").detail("SimTime", now()).detail("RealTime", 0).detail("RandomUnseed", 0); - flushAndExit(0); - } - ASSERT(ar.protocolVersion().hasMultiGenerationTLog()); if(ar.protocolVersion().hasTagLocality()) { serializer(ar, tLogs, logRouterTags, oldTLogData, recoveryCount, logSystemType); diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp index 576e811c50..d51e190187 100644 --- a/fdbserver/fdbserver.actor.cpp +++ b/fdbserver/fdbserver.actor.cpp @@ -1944,7 +1944,6 @@ int main(int argc, char* argv[]) { if (role==Simulation){ printf("Unseed: %d\n", unseed); printf("Elapsed: %f simsec, %f real seconds\n", now()-startNow, timer()-start); - //cout << format(" %d endpoints left\n", transport().getEndpointCount()); } //IFailureMonitor::failureMonitor().address_info.clear();