fdbclient now compiling

2025-05-14 01:42:37 +08:00 · 2022-06-23 18:05:36 -06:00 · 2022-06-23 18:05:36 -06:00 · 8af056e7b0
commit 8af056e7b0
parent 9d80ee0cb6
22 changed files with 53 additions and 17 deletions
--- a/fdbclient/BackupContainer.actor.cpp
+++ b/fdbclient/BackupContainer.actor.cpp
@ -37,7 +37,9 @@
 #include "fdbrpc/simulator.h"
 #include "flow/Platform.h"
 #include "fdbclient/AsyncFileS3BlobStore.actor.h"
+#ifdef BUILD_AZURE_BACKUP
 #include "fdbclient/BackupContainerAzureBlobStore.h"
+#endif
 #include "fdbclient/BackupContainerFileSystem.h"
 #include "fdbclient/BackupContainerLocalDirectory.h"
 #include "fdbclient/BackupContainerS3BlobStore.h"
--- a/fdbclient/BackupContainerFileSystem.actor.cpp
+++ b/fdbclient/BackupContainerFileSystem.actor.cpp
@ -19,7 +19,9 @@
 */

 #include "fdbclient/BackupAgent.actor.h"
+#ifdef BUILD_AZURE_BACKUP
 #include "fdbclient/BackupContainerAzureBlobStore.h"
+#endif
 #include "fdbclient/BackupContainerFileSystem.h"
 #include "fdbclient/BackupContainerLocalDirectory.h"
 #include "fdbclient/BackupContainerS3BlobStore.h"
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@ -1,6 +1,7 @@
 set(FDBCLIENT_SRCS
  ActorLineageProfiler.h
  ActorLineageProfiler.cpp
+  AnnotateActor.h
  AnnotateActor.cpp
  AsyncFileS3BlobStore.actor.cpp
  AsyncFileS3BlobStore.actor.h
@ -75,6 +76,7 @@ set(FDBCLIENT_SRCS
  IConfigTransaction.h
  ISingleThreadTransaction.cpp
  ISingleThreadTransaction.h
+  JSONDoc.h
  JsonBuilder.cpp
  JsonBuilder.h
  KeyBackedTypes.h
@ -105,6 +107,7 @@ set(FDBCLIENT_SRCS
  PaxosConfigTransaction.actor.cpp
  PaxosConfigTransaction.h
  PImpl.h
+  ProcessInterface.h
  SimpleConfigTransaction.actor.cpp
  SpecialKeySpace.actor.cpp
  SpecialKeySpace.actor.h
@ -119,6 +122,7 @@ set(FDBCLIENT_SRCS
  RunTransaction.actor.h
  RYWIterator.cpp
  RYWIterator.h
+  S3BlobStore.h
  S3BlobStore.actor.cpp
  Schemas.cpp
  Schemas.h
@ -155,6 +159,7 @@ set(FDBCLIENT_SRCS
  ThreadSafeTransaction.h
  Tracing.h
  Tracing.actor.cpp
+  TransactionLineage.h
  Tuple.cpp
  Tuple.h
  VersionedMap.actor.h
@ -164,7 +169,6 @@ set(FDBCLIENT_SRCS
  Versionstamp.h
  VersionVector.h
  VersionVector.cpp
-  WellKnownEndpoints.h
  WriteMap.h
  WriteMap.cpp
  json_spirit/json_spirit_error_position.h
@ -172,9 +176,19 @@ set(FDBCLIENT_SRCS
  json_spirit/json_spirit_value.h
  json_spirit/json_spirit_writer_options.h
  json_spirit/json_spirit_writer_template.h
+  libb64/encode.h
+  libb64/decode.h
+  libb64/cdecode.h
  libb64/cdecode.c
+  libb64/cencode.h
  libb64/cencode.c
+  md5/md5.h
  md5/md5.c
+  rapidxml/rapidxml.hpp
+  rapidxml/rapidxml_iterators.hpp
+  rapidxml/rapidxml_print.hpp
+  rapidxml/rapidxml_utils.hpp
+  sha1/SHA1.h
  sha1/SHA1.cpp
  zipf.c
  zipf.h)
@ -184,9 +198,20 @@ message(STATUS "FDB package name is ${FDB_PACKAGE_NAME}")

 set(options_srcs ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g.cpp)

-vexillographer_compile(TARGET fdboptions LANG cpp OUT ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g
+make_directory(${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/)
+vexillographer_compile(TARGET fdboptions_vex LANG cpp OUT ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g.h ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g.cpp)

+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/FDBOptions.g.h
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g.h
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g.h ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/FDBOptions.g.h)
+
+vexillographer_compile(TARGET fdboptions_c LANG c OUT ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/fdb_c_options.g.h
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/fdb_c_options.g.h)
+
+add_custom_target(fdboptions DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/FDBOptions.g.h)
+add_dependencies(fdboptions fdboptions_c)
+
 set(BUILD_AZURE_BACKUP OFF CACHE BOOL "Build Azure backup client")
 if(BUILD_AZURE_BACKUP)
  add_compile_definitions(BUILD_AZURE_BACKUP)
--- a/fdbclient/CommitTransaction.h
+++ b/fdbclient/CommitTransaction.h
@ -24,7 +24,7 @@

 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/Knobs.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"

 // The versioned message has wire format : -1, version, messages
 static const int32_t VERSION_HEADER = -1;
--- a/fdbclient/HTTP.actor.cpp
+++ b/fdbclient/HTTP.actor.cpp
@ -18,10 +18,12 @@
 * limitations under the License.
 */

-#include "fdbrpc/HTTP.h"
+#include "fdbclient/HTTP.h"

 #include "fdbclient/md5/md5.h"
+#include "fdbclient/ClientKnobs.h"
 #include "fdbclient/libb64/encode.h"
+#include "fdbclient/Knobs.h"
 #include <cctype>

 #include "flow/actorcompiler.h" // has to be last include
--- a/fdbclient/IClientApi.h
+++ b/fdbclient/IClientApi.h
@ -27,7 +27,7 @@
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/Tenant.h"

-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/ThreadHelper.actor.h"

 struct VersionVector;
--- a/fdbclient/MultiVersionTransaction.h
+++ b/fdbclient/MultiVersionTransaction.h
@ -23,7 +23,7 @@
 #include "flow/ProtocolVersion.h"
 #pragma once

-#include "bindings/c/foundationdb/fdb_c_options.g.h"
+#include "fdbclient/fdb_c_options.g.h"
 #include "fdbclient/FDBOptions.g.h"
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/IClientApi.h"
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@ -82,7 +82,7 @@
 #include "flow/Platform.h"
 #include "flow/SystemMonitor.h"
 #include "flow/TLSConfig.actor.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/UnitTest.h"
 #include "flow/network.h"
 #include "flow/serialize.h"
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@ -20,7 +20,7 @@

 #pragma once
 #include "flow/IRandom.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #if defined(NO_INTELLISENSE) && !defined(FDBCLIENT_NATIVEAPI_ACTOR_G_H)
 #define FDBCLIENT_NATIVEAPI_ACTOR_G_H
 #include "fdbclient/NativeAPI.actor.g.h"
--- a/fdbclient/S3BlobStore.actor.cpp
+++ b/fdbclient/S3BlobStore.actor.cpp
@ -41,7 +41,9 @@
 #include "flow/Hostname.h"
 #include "flow/UnitTest.h"
 #include "fdbclient/rapidxml/rapidxml.hpp"
+#ifdef BUILD_AWS_BACKUP
 #include "fdbclient/FDBAWSCredentialsProvider.h"
+#endif

 #include "flow/actorcompiler.h" // has to be last include

--- a/fdbclient/SimpleConfigTransaction.actor.cpp
+++ b/fdbclient/SimpleConfigTransaction.actor.cpp
@ -24,7 +24,6 @@
 #include "fdbclient/DatabaseContext.h"
 #include "fdbclient/IKnobCollection.h"
 #include "fdbclient/SimpleConfigTransaction.h"
-#include "fdbserver/Knobs.h"
 #include "flow/Arena.h"
 #include "flow/actorcompiler.h" // This must be the last #include.

--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@ -35,7 +35,7 @@
 #include "fdbclient/CommitTransaction.h"
 #include "fdbclient/TagThrottle.actor.h"
 #include "fdbclient/Tenant.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/UnitTest.h"
 #include "fdbclient/VersionVector.h"

--- a/fdbclient/Tracing.actor.cpp
+++ b/fdbclient/Tracing.actor.cpp
@ -18,7 +18,7 @@
 * limitations under the License.
 */

-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/IRandom.h"
 #include "flow/UnitTest.h"
 #include "flow/Knobs.h"
--- a/fdbclient/Tracing.h
+++ b/fdbclient/Tracing.h
@ -23,6 +23,8 @@
 #include "flow/network.h"
 #include "flow/IRandom.h"
 #include "flow/Arena.h"
+#include "fdbrpc/FlowTransport.h"
+#include "fdbclient/FDBTypes.h"
 #include <unordered_set>
 #include <atomic>

--- a/fdbrpc/CMakeLists.txt
+++ b/fdbrpc/CMakeLists.txt
@ -58,6 +58,7 @@ set(FDBRPC_SRCS
  Stats.h
  simulator.h
  sim2.actor.cpp
+  sim_validation.h
  sim_validation.cpp
  TenantInfo.h
  TimedRequest.h
--- a/fdbserver/BackupWorker.actor.cpp
+++ b/fdbserver/BackupWorker.actor.cpp
@ -34,7 +34,7 @@
 #include "flow/Error.h"

 #include "flow/IRandom.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/actorcompiler.h" // This must be the last #include.

 #define SevDebugMemory SevVerbose
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@ -52,7 +52,7 @@
 #include "flow/IRandom.h"
 #include "flow/Knobs.h"
 #include "flow/Trace.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"

 #include "flow/actorcompiler.h" // This must be the last #include.

--- a/fdbserver/OTELSpanContextMessage.h
+++ b/fdbserver/OTELSpanContextMessage.h
@ -22,7 +22,7 @@
 #define FDBSERVER_OTELSPANCONTEXTMESSAGE_H
 #pragma once

-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/CommitTransaction.h"

--- a/fdbserver/fdbserver.actor.cpp
+++ b/fdbserver/fdbserver.actor.cpp
@ -77,7 +77,7 @@
 #include "flow/SimpleOpt.h"
 #include "flow/SystemMonitor.h"
 #include "flow/TLSConfig.actor.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/WriteOnlySet.h"
 #include "flow/UnitTest.h"
 #include "flow/FaultInjection.h"
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@ -37,7 +37,7 @@
 #include "flow/IndexedSet.h"
 #include "flow/SystemMonitor.h"
 #include "flow/Trace.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/Util.h"
 #include "fdbclient/Atomic.h"
 #include "fdbclient/DatabaseContext.h"
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@ -22,7 +22,7 @@
 #include "boost/lexical_cast.hpp"

 #include "flow/IRandom.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbserver/TesterInterface.actor.h"
 #include "fdbserver/workloads/workloads.actor.h"
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@ -116,6 +116,7 @@ set(FLOW_SRCS
  serialize.cpp
  serialize.h
  sse2neon.h
+  singleton.h
  stacktrace.h
  test_memcpy.cpp
  test_memcpy_perf.cpp