From 91e05575a2d64acffa08f59e1b7f9559a820f77b Mon Sep 17 00:00:00 2001
From: Alex Miller <alexmiller@apple.com>
Date: Thu, 7 Feb 2019 17:02:28 -0800
Subject: [PATCH] Rename OldTLogServer -> OldTLogServer_4_6

---
 fdbserver/CMakeLists.txt                                        | 2 +-
 .../{OldTLogServer.actor.cpp => OldTLogServer_4_6.actor.cpp}    | 2 +-
 fdbserver/TLogServer.actor.cpp                                  | 2 +-
 fdbserver/WorkerInterface.actor.h                               | 2 +-
 fdbserver/fdbserver.vcxproj                                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename fdbserver/{OldTLogServer.actor.cpp => OldTLogServer_4_6.actor.cpp} (99%)

diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt
index 6f5ed5aca7..f1a360d9d7 100644
--- a/fdbserver/CMakeLists.txt
+++ b/fdbserver/CMakeLists.txt
@@ -48,7 +48,7 @@ set(FDBSERVER_SRCS
   MoveKeys.actor.h
   networktest.actor.cpp
   NetworkTest.h
-  OldTLogServer.actor.cpp
+  OldTLogServer_4_6.actor.cpp
   Orderer.actor.h
   pubsub.actor.cpp
   pubsub.h
diff --git a/fdbserver/OldTLogServer.actor.cpp b/fdbserver/OldTLogServer_4_6.actor.cpp
similarity index 99%
rename from fdbserver/OldTLogServer.actor.cpp
rename to fdbserver/OldTLogServer_4_6.actor.cpp
index 3285df7159..58179dba61 100644
--- a/fdbserver/OldTLogServer.actor.cpp
+++ b/fdbserver/OldTLogServer_4_6.actor.cpp
@@ -43,7 +43,7 @@ using std::make_pair;
 using std::min;
 using std::max;
 
-namespace oldTLog {
+namespace oldTLog_4_6 {
 
 	typedef int16_t OldTag;
 
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 1fc54108bc..6501d15d06 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -1711,7 +1711,7 @@ ACTOR Future<Void> restorePersistentState( TLogData* self, LocalityData locality
 			tlogRequests.getFuture().pop().reply.sendError(recruitment_failed());
 		}
 
-		wait( oldTLog::tLog(self->persistentData, self->rawPersistentQueue, self->dbInfo, locality, self->dbgid) );
+		wait( oldTLog_4_6::tLog(self->persistentData, self->rawPersistentQueue, self->dbInfo, locality, self->dbgid) );
 		throw internal_error();
 	}
 
diff --git a/fdbserver/WorkerInterface.actor.h b/fdbserver/WorkerInterface.actor.h
index a8247b579e..3885ec94d2 100644
--- a/fdbserver/WorkerInterface.actor.h
+++ b/fdbserver/WorkerInterface.actor.h
@@ -363,7 +363,7 @@ ACTOR Future<Void> dataDistributor(DataDistributorInterface ddi, Reference<Async
 void registerThreadForProfiling();
 void updateCpuProfiler(ProfilerRequest req);
 
-namespace oldTLog {
+namespace oldTLog_4_6 {
 ACTOR Future<Void> tLog(IKeyValueStore* persistentData, IDiskQueue* persistentQueue,
                         Reference<AsyncVar<ServerDBInfo>> db, LocalityData locality, UID tlogId);
 }
diff --git a/fdbserver/fdbserver.vcxproj b/fdbserver/fdbserver.vcxproj
index 8848f89c2b..5fd014dda7 100644
--- a/fdbserver/fdbserver.vcxproj
+++ b/fdbserver/fdbserver.vcxproj
@@ -57,8 +57,8 @@
     <ActorCompiler Include="LogSystemPeekCursor.actor.cpp" />
     <ActorCompiler Include="MemoryPager.actor.cpp" />
     <ActorCompiler Include="LogRouter.actor.cpp" />
-    <ActorCompiler Include="OldTLogServer.actor.cpp" />
     <ClCompile Include="LatencyBandConfig.cpp" />
+    <ActorCompiler Include="OldTLogServer_4_6.actor.cpp" />
     <ClCompile Include="SkipList.cpp" />
     <ActorCompiler Include="WaitFailure.actor.cpp" />
     <ActorCompiler Include="tester.actor.cpp" />