moved wellknownendpoints and fixed some includes

oppo-bigdata · Jun 23, 2022 · ffaf15c · ffaf15c
1 parent 10e478d
commit ffaf15c
Show file tree

Hide file tree

Showing 50 changed files with 73 additions and 53 deletions.
diff --git a/fdbclient/ActorLineageProfiler.cpp b/fdbclient/ActorLineageProfiler.cpp
@@ -20,7 +20,7 @@
 
 #include "flow/flow.h"
 #include "flow/singleton.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "fdbclient/ActorLineageProfiler.h"
 #include "fdbclient/NameLineage.h"
 #include <msgpack.hpp>

diff --git a/fdbclient/AsyncFileS3BlobStore.actor.h b/fdbclient/AsyncFileS3BlobStore.actor.h
@@ -31,10 +31,10 @@
 #include <sstream>
 #include <time.h>
 
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/serialize.h"
 #include "flow/Net2Packet.h"
-#include "fdbrpc/IRateControl.h"
+#include "flow/IRateControl.h"
 #include "fdbclient/S3BlobStore.h"
 #include "fdbclient/md5/md5.h"
 #include "fdbclient/libb64/encode.h"

diff --git a/fdbclient/BackupAgent.actor.h b/fdbclient/BackupAgent.actor.h
@@ -29,7 +29,7 @@
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/TaskBucket.h"
 #include "fdbclient/Notified.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "fdbclient/KeyBackedTypes.h"
 #include <ctime>
 #include <climits>

diff --git a/fdbclient/BackupContainer.h b/fdbclient/BackupContainer.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include "flow/flow.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/ReadYourWrites.h"

diff --git a/fdbclient/BackupContainerLocalDirectory.actor.cpp b/fdbclient/BackupContainerLocalDirectory.actor.cpp
@@ -20,7 +20,7 @@
 
 #include "fdbclient/BackupContainerLocalDirectory.h"
 #include "fdbrpc/AsyncFileReadAhead.actor.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/Platform.actor.h"
 #include "flow/Platform.h"
 #include "fdbrpc/simulator.h"

diff --git a/fdbclient/CoordinationInterface.h b/fdbclient/CoordinationInterface.h
@@ -27,7 +27,7 @@
 #include "fdbrpc/Locality.h"
 #include "fdbclient/CommitProxyInterface.h"
 #include "fdbclient/ClusterInterface.h"
-#include "fdbclient/WellKnownEndpoints.h"
+#include "fdbrpc/WellKnownEndpoints.h"
 #include "flow/Hostname.h"
 
 const int MAX_CLUSTER_FILE_BYTES = 60000;

diff --git a/fdbclient/DatabaseBackupAgent.actor.cpp b/fdbclient/DatabaseBackupAgent.actor.cpp
@@ -26,7 +26,7 @@
 #include "fdbclient/NativeAPI.actor.h"
 #include <ctime>
 #include <climits>
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/genericactors.actor.h"
 #include "flow/Hash3.h"
 #include <numeric>

diff --git a/fdbclient/FileBackupAgent.actor.cpp b/fdbclient/FileBackupAgent.actor.cpp
@@ -33,7 +33,7 @@
 #include <cinttypes>
 #include <ctime>
 #include <climits>
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/genericactors.actor.h"
 #include "flow/Hash3.h"
 #include <numeric>

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
@@ -63,7 +63,7 @@
 #include "fdbclient/SystemData.h"
 #include "fdbclient/TransactionLineage.h"
 #include "fdbclient/versions.h"
-#include "fdbclient/WellKnownEndpoints.h"
+#include "fdbrpc/WellKnownEndpoints.h"
 #include "fdbrpc/LoadBalance.h"
 #include "fdbrpc/Net2FileSystem.h"
 #include "fdbrpc/simulator.h"

diff --git a/fdbclient/ProcessInterface.h b/fdbclient/ProcessInterface.h
@@ -21,7 +21,7 @@
 #include "fdbclient/AnnotateActor.h"
 #include "fdbclient/FDBTypes.h"
 #include "fdbrpc/fdbrpc.h"
-#include "fdbclient/WellKnownEndpoints.h"
+#include "fdbrpc/WellKnownEndpoints.h"
 
 struct ProcessInterface {
 	constexpr static FileIdentifier file_identifier = 985636;

diff --git a/fdbclient/S3BlobStore.actor.cpp b/fdbclient/S3BlobStore.actor.cpp
@@ -37,7 +37,7 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string.hpp>
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/Hostname.h"
 #include "flow/UnitTest.h"
 #include "fdbclient/rapidxml/rapidxml.hpp"

diff --git a/fdbclient/S3BlobStore.h b/fdbclient/S3BlobStore.h
@@ -25,7 +25,7 @@
 #include "flow/flow.h"
 #include "flow/Net2Packet.h"
 #include "fdbclient/Knobs.h"
-#include "fdbrpc/IRateControl.h"
+#include "flow/IRateControl.h"
 #include "fdbrpc/HTTP.h"
 #include "fdbclient/JSONDoc.h"
 

diff --git a/fdbrpc/AsyncFileCached.actor.h b/fdbrpc/AsyncFileCached.actor.h
@@ -32,7 +32,7 @@
 #include <type_traits>
 
 #include "flow/flow.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/Knobs.h"
 #include "flow/TDMetric.actor.h"
 #include "flow/network.h"

diff --git a/fdbrpc/AsyncFileChaos.h b/fdbrpc/AsyncFileChaos.h
@@ -22,7 +22,7 @@
 
 #include "flow/flow.h"
 #include "flow/serialize.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/network.h"
 #include "flow/ActorCollection.h"
 

diff --git a/fdbrpc/AsyncFileEIO.actor.h b/fdbrpc/AsyncFileEIO.actor.h
@@ -35,10 +35,10 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#include "fdbrpc/libeio/eio.h"
+#include "eio.h"
 #include "flow/flow.h"
 #include "flow/ThreadHelper.actor.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/TDMetric.actor.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 

diff --git a/fdbrpc/AsyncFileEncrypted.h b/fdbrpc/AsyncFileEncrypted.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/FastRef.h"
 #include "flow/flow.h"
 #include "flow/IRandom.h"

diff --git a/fdbrpc/AsyncFileKAIO.actor.h b/fdbrpc/AsyncFileKAIO.actor.h
@@ -29,7 +29,7 @@
 #elif !defined(FLOW_ASYNCFILEKAIO_ACTOR_H)
 #define FLOW_ASYNCFILEKAIO_ACTOR_H
 
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 
 #include <stdio.h>
 #include <fcntl.h>

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -29,7 +29,7 @@
 #define FLOW_ASYNCFILENONDURABLE_ACTOR_H
 
 #include "flow/flow.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/ActorCollection.h"
 #include "fdbrpc/simulator.h"
 #include "fdbrpc/TraceFileIO.h"

diff --git a/fdbrpc/AsyncFileReadAhead.actor.h b/fdbrpc/AsyncFileReadAhead.actor.h
@@ -29,7 +29,7 @@
 #define FDBRPC_ASYNCFILEREADAHEAD_ACTOR_H
 
 #include "flow/flow.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 // Read-only file type that wraps another file instance, reads in large blocks, and reads ahead of the actual range

diff --git a/fdbrpc/AsyncFileWriteChecker.h b/fdbrpc/AsyncFileWriteChecker.h
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/crc32c.h"
 
 #if VALGRIND

diff --git a/fdbrpc/CMakeLists.txt b/fdbrpc/CMakeLists.txt
@@ -16,41 +16,62 @@ set(FDBRPC_SRCS
   Base64UrlDecode.cpp
   Base64UrlEncode.h
   Base64UrlEncode.cpp
+  ContinuousSample.h
+  FailureMonitor.h
   FailureMonitor.actor.cpp
+  fdbrpc.h
   FlowProcess.actor.h
+  FlowTransport.h
   FlowTransport.actor.cpp
   genericactors.actor.h
   genericactors.actor.cpp
+  HealthMonitor.h
   HealthMonitor.actor.cpp
+  HTTP.h
   HTTP.actor.cpp
+  IPAllowList.h
   IPAllowList.cpp
-  LoadBalance.actor.cpp
+  LoadBalance.h
   LoadBalance.actor.h
+  LoadBalance.actor.cpp
+  Locality.h
   Locality.cpp
+  MultiInterface.h
+  Net2FileSystem.h
   Net2FileSystem.cpp
   networksender.actor.h
   PerfMetric.cpp
   PerfMetric.h
+  QueueModel.h
   QueueModel.cpp
+  RangeMap.h
+  Replication.h
+  ReplicationPolicy.h
   ReplicationPolicy.cpp
+  ReplicationTypes.h
   ReplicationTypes.cpp
+  ReplicationUtils.h
   ReplicationUtils.cpp
   RESTClient.h
   RESTClient.actor.cpp
   RESTUtils.h
   RESTUtils.actor.cpp
   SimExternalConnection.actor.cpp
   SimExternalConnection.h
+  Smoother.h
   Stats.actor.cpp
   Stats.h
   simulator.h
   sim2.actor.cpp
   sim_validation.cpp
+  TenantInfo.h
   TimedRequest.h
   TokenSign.h
   TokenSign.cpp
+  TraceFileIO.h
   TraceFileIO.cpp
-  TSSComparison.h)
+  TSSComparison.h
+  WellKnownEndpoints.h)
 
 set(COMPILE_EIO OFF)
 

diff --git a/fdbrpc/FlowTests.actor.cpp b/fdbrpc/FlowTests.actor.cpp
@@ -27,7 +27,7 @@
 #include "flow/IThreadPool.h"
 #include "flow/WriteOnlySet.h"
 #include "fdbrpc/fdbrpc.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/TLSConfig.actor.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 

diff --git a/fdbrpc/HTTP.h b/fdbrpc/HTTP.h
@@ -25,8 +25,7 @@
 
 #include "flow/flow.h"
 #include "flow/Net2Packet.h"
-#include "fdbrpc/IRateControl.h"
-#include "fdbclient/Knobs.h"
+#include "flow/IRateControl.h"
 
 namespace HTTP {
 struct is_iless {

diff --git a/fdbrpc/Net2FileSystem.h b/fdbrpc/Net2FileSystem.h
@@ -23,7 +23,7 @@
 #include <string>
 #pragma once
 
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 
 class Net2FileSystem final : public IAsyncFileSystem {
 public:

diff --git a/fdbrpc/RESTClient.actor.cpp b/fdbrpc/RESTClient.actor.cpp
@@ -21,7 +21,7 @@
 #include "fdbrpc/RESTClient.h"
 
 #include "fdbrpc/HTTP.h"
-#include "fdbrpc/IRateControl.h"
+#include "flow/IRateControl.h"
 #include "fdbrpc/RESTUtils.h"
 #include "flow/Arena.h"
 #include "flow/Error.h"

diff --git a/fdbclient/WellKnownEndpoints.h → fdbrpc/WellKnownEndpoints.h b/fdbclient/WellKnownEndpoints.h → fdbrpc/WellKnownEndpoints.h
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
@@ -28,7 +28,7 @@
 
 #include "flow/genericactors.actor.h"
 #include "fdbrpc/fdbrpc.h"
-#include "fdbclient/WellKnownEndpoints.h"
+#include "fdbrpc/WellKnownEndpoints.h"
 #include "flow/Hostname.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 

diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
@@ -35,7 +35,7 @@
 #include "flow/ProtocolVersion.h"
 #include "flow/Util.h"
 #include "flow/WriteOnlySet.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "fdbrpc/AsyncFileCached.actor.h"
 #include "fdbrpc/AsyncFileEncrypted.h"
 #include "fdbrpc/AsyncFileNonDurable.actor.h"

diff --git a/fdbrpc/simulator.h b/fdbrpc/simulator.h
@@ -29,7 +29,7 @@
 #include "flow/Histogram.h"
 #include "fdbrpc/FailureMonitor.h"
 #include "fdbrpc/Locality.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "flow/TDMetric.actor.h"
 #include <random>
 #include "fdbrpc/ReplicationPolicy.h"

diff --git a/fdbserver/CoordinationInterface.h b/fdbserver/CoordinationInterface.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include "fdbclient/CoordinationInterface.h"
-#include "fdbclient/WellKnownEndpoints.h"
+#include "fdbrpc/WellKnownEndpoints.h"
 #include "fdbserver/ConfigFollowerInterface.h"
 #include "fdbserver/ConfigBroadcastInterface.h"
 

diff --git a/fdbserver/DiskQueue.actor.cpp b/fdbserver/DiskQueue.actor.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "fdbserver/IDiskQueue.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "fdbserver/Knobs.h"
 #include "fdbrpc/simulator.h"
 #include "flow/crc32c.h"

diff --git a/fdbserver/FDBExecHelper.actor.cpp b/fdbserver/FDBExecHelper.actor.cpp
@@ -27,7 +27,7 @@
 #include "fdbrpc/FlowProcess.actor.h"
 #include "fdbrpc/Net2FileSystem.h"
 #include "fdbrpc/simulator.h"
-#include "fdbclient/WellKnownEndpoints.h"
+#include "fdbrpc/WellKnownEndpoints.h"
 #include "fdbclient/versions.h"
 #include "fdbserver/CoroFlow.h"
 #include "fdbserver/FDBExecHelper.actor.h"

diff --git a/fdbserver/RESTKmsConnector.actor.cpp b/fdbserver/RESTKmsConnector.actor.cpp
@@ -22,7 +22,7 @@
 
 #include "fdbclient/FDBTypes.h"
 #include "fdbrpc/HTTP.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "fdbserver/KmsConnectorInterface.h"
 #include "fdbserver/Knobs.h"
 #include "fdbrpc/RESTClient.h"

diff --git a/fdbserver/RestoreCommon.actor.h b/fdbserver/RestoreCommon.actor.h
@@ -33,7 +33,7 @@
 #include "flow/genericactors.actor.h"
 #include "fdbclient/Tuple.h"
 #include "fdbclient/NativeAPI.actor.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "fdbclient/BackupAgent.actor.h"
 #include "fdbserver/Knobs.h"
 

diff --git a/fdbserver/RestoreUtil.h b/fdbserver/RestoreUtil.h
@@ -32,7 +32,7 @@
 #include "flow/flow.h"
 #include "fdbrpc/TimedRequest.h"
 #include "fdbrpc/fdbrpc.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "fdbrpc/Stats.h"
 #include <cstdint>
 #include <cstdarg>

diff --git a/fdbserver/RestoreWorker.actor.cpp b/fdbserver/RestoreWorker.actor.cpp
@@ -31,7 +31,7 @@
 #include "fdbclient/ManagementAPI.actor.h"
 #include "fdbclient/MutationList.h"
 #include "fdbclient/BackupContainer.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "fdbrpc/simulator.h"
 #include "flow/genericactors.actor.h"
 #include "flow/Hash3.h"

diff --git a/fdbserver/RestoreWorker.actor.h b/fdbserver/RestoreWorker.actor.h
@@ -28,7 +28,7 @@
 #include "fdbclient/Tuple.h"
 #include "flow/flow.h"
 #include "fdbrpc/fdbrpc.h"
-#include "fdbrpc/IAsyncFile.h"
+#include "flow/IAsyncFile.h"
 #include "fdbrpc/Stats.h"
 #include <cstdint>
 #include <cstdarg>

diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
@@ -41,7 +41,7 @@
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/BackupAgent.actor.h"
 #include "fdbclient/versions.h"
-#include "fdbclient/WellKnownEndpoints.h"
+#include "fdbrpc/WellKnownEndpoints.h"
 #include "flow/ProtocolVersion.h"
 #include "flow/network.h"
 #include "flow/TypeTraits.h"