diff options
Diffstat (limited to 'databases/foundationdb73-server/files')
18 files changed, 0 insertions, 429 deletions
diff --git a/databases/foundationdb73-server/files/foundationdb.conf.in b/databases/foundationdb73-server/files/foundationdb.conf.in deleted file mode 100644 index 1df7fe1cf17f..000000000000 --- a/databases/foundationdb73-server/files/foundationdb.conf.in +++ /dev/null @@ -1,47 +0,0 @@ -## foundationdb.conf -## -## Configuration file for FoundationDB server processes -## Full documentation is available at -## https://apple.github.io/foundationdb/configuration.html#the-configuration-file - -[fdbmonitor] -user = %%FOUNDATIONDB_USER%% -group = %%FOUNDATIONDB_GROUP%% - -[general] -restart-delay = 60 -## by default, restart-backoff = restart-delay-reset-interval = restart-delay -# initial-restart-delay = 0 -# restart-backoff = 60 -# restart-delay-reset-interval = 60 -cluster-file = %%ETCDIR%%/fdb.cluster -# delete-envvars = -# kill-on-configuration-change = true - -## Default parameters for individual fdbserver processes -[fdbserver] -command = %%PREFIX%%/sbin/fdbserver -public-address = auto:$ID -listen-address = public -datadir = %%FOUNDATIONDB_DBDIR%%/data/$ID -logdir = %%FOUNDATIONDB_LOGDIR%% -# logsize = 10MiB -# maxlogssize = 100MiB -# machine-id = -# datacenter-id = -# class = -# memory = 8GiB -# storage-memory = 1GiB -# cache-memory = 2GiB -# metrics-cluster = -# metrics-prefix = - -## An individual fdbserver process with id 4500 -## Parameters set here override defaults from the [fdbserver] section -[fdbserver.4500] - -[backup_agent] -command = %%PREFIX%%/lib/foundationdb/backup_agent/backup_agent -logdir = %%FOUNDATIONDB_LOGDIR%% - -[backup_agent.1] diff --git a/databases/foundationdb73-server/files/foundationdb.in b/databases/foundationdb73-server/files/foundationdb.in deleted file mode 100644 index 719582a235d2..000000000000 --- a/databases/foundationdb73-server/files/foundationdb.in +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# PROVIDE: foundationdb -# REQUIRE: LOGIN -# BEFORE: securelevel -# KEYWORD: shutdown - -# Add the following line to /etc/rc.conf to enable `foundationdb': -# -#foundationdb_enable="YES" -# -# Define config file here to run with different config file: -# -#foundationdb_config="xxxxx" -# - -. /etc/rc.subr - -name="foundationdb" -rcvar="${name}_enable" - -load_rc_config "$name" - -: ${foundationdb_enable="NO"} -: ${foundationdb_user="%%FOUNDATIONDB_USER%%"} -: ${foundationdb_group="%%FOUNDATIONDB_GROUP%%"} -: ${foundationdb_config="%%PREFIX%%/etc/foundationdb/foundationdb.conf"} - -start_precmd="foundationdb_start_precmd" - -pidfile="/var/run/fdbmonitor.pid" -command=%%PREFIX%%/sbin/fdbmonitor -command_args="--conffile ${foundationdb_config} --lockfile ${pidfile} --daemonize" - -foundationdb_start_precmd() -{ - if [ ! -e "${pidfile}" ]; then - install -m 0600 -o "${foundationdb_user}" -g "${foundationdb_group}" /dev/null "${pidfile}" - fi -} - -run_rc_command $1 diff --git a/databases/foundationdb73-server/files/patch-CMakeLists.txt b/databases/foundationdb73-server/files/patch-CMakeLists.txt deleted file mode 100644 index ca88d0ad7354..000000000000 --- a/databases/foundationdb73-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- CMakeLists.txt.orig 2024-01-09 21:06:41 UTC -+++ CMakeLists.txt -@@ -193,8 +193,10 @@ else() - endif() - add_subdirectory(fdbbackup) - add_subdirectory(metacluster) --add_subdirectory(tests) --add_subdirectory(flowbench EXCLUDE_FROM_ALL) -+#add_subdirectory(tests) -+if(WITH_FLOWBENCH) -+ add_subdirectory(flowbench EXCLUDE_FROM_ALL) -+endif() - if(WITH_PYTHON AND WITH_C_BINDING) - add_subdirectory(bindings) - endif() diff --git a/databases/foundationdb73-server/files/patch-bindings_CMakeLists.txt b/databases/foundationdb73-server/files/patch-bindings_CMakeLists.txt deleted file mode 100644 index 3ca56cdf6cbd..000000000000 --- a/databases/foundationdb73-server/files/patch-bindings_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bindings/CMakeLists.txt.orig 2024-01-09 21:06:41 UTC -+++ bindings/CMakeLists.txt -@@ -15,7 +15,7 @@ endif() - if(WITH_RUBY_BINDING) - add_subdirectory(ruby) - endif() --if(NOT WIN32 AND NOT OPEN_FOR_IDE) -+if(FALSE) - package_bindingtester() - package_bindingtester2() - endif() diff --git a/databases/foundationdb73-server/files/patch-bindings_c_CMakeLists.txt b/databases/foundationdb73-server/files/patch-bindings_c_CMakeLists.txt deleted file mode 100644 index abf28118094b..000000000000 --- a/databases/foundationdb73-server/files/patch-bindings_c_CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ ---- bindings/c/CMakeLists.txt.orig 2024-01-09 21:06:41 UTC -+++ bindings/c/CMakeLists.txt -@@ -100,7 +100,7 @@ if(WIN32) - endif() - - # The tests don't build on windows --if(NOT WIN32) -+if(FALSE) - set(MAKO_SRCS - test/mako/admin_server.hpp - test/mako/admin_server.cpp -@@ -212,7 +212,7 @@ if(NOT WIN32) - - target_include_directories(fdb_c_api_tester_impl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/foundationdb/ ${CMAKE_SOURCE_DIR}/flow/include ${CMAKE_BINARY_DIR}/flow/include) - target_link_libraries(fdb_c_api_tester_impl PRIVATE fdb_cpp toml11_target Threads::Threads fmt::fmt boost_target) -- if(NOT APPLE) -+ if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") - target_link_libraries(fdb_c_api_tester_impl PRIVATE stdc++fs) - endif() - target_link_libraries(fdb_c_api_tester_impl PRIVATE SimpleOpt) -@@ -439,6 +439,11 @@ elseif(NOT WIN32 AND NOT APPLE) # Linux Only - ${SHIM_LIB_OUTPUT_DIR}/libfdb_c.so.tramp.S) - - set(IMPLIBSO_SRC_DIR ${CMAKE_SOURCE_DIR}/contrib/Implib.so) -+ -+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") -+ set(CMAKE_SYSTEM_PROCESSOR "x86_64") -+ endif() -+ - set(IMPLIBSO_SRC - ${IMPLIBSO_SRC_DIR}/implib-gen.py - ${IMPLIBSO_SRC_DIR}/arch/common/init.cpp.tpl -@@ -464,31 +469,6 @@ elseif(NOT WIN32 AND NOT APPLE) # Linux Only - $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/foundationdb>) -- -- add_executable(fdb_c_shim_unit_tests) -- target_link_libraries(fdb_c_shim_unit_tests PRIVATE fdb_c_shim fdb_c_unit_tests_impl) -- -- add_executable(fdb_c_shim_api_tester) -- target_link_libraries(fdb_c_shim_api_tester PRIVATE fdb_c_shim fdb_c_api_tester_impl) -- -- add_executable(fdb_c_shim_lib_tester test/shim_lib_tester.cpp) -- target_link_libraries(fdb_c_shim_lib_tester PRIVATE fdb_c_shim SimpleOpt fdb_cpp Threads::Threads) -- target_include_directories(fdb_c_shim_lib_tester PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/foundationdb/ ${CMAKE_SOURCE_DIR}/flow/include) -- -- set(SHIM_LIB_TEST_EXTRA_OPTIONS "") -- if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR USE_SANITIZER) -- list(APPEND SHIM_LIB_TEST_EXTRA_OPTIONS --disable-prev-version-tests) -- endif() -- -- add_python_venv_test(NAME fdb_c_shim_library_tests -- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/test/fdb_c_shim_tests.py -- --build-dir ${CMAKE_BINARY_DIR} -- --unit-tests-bin $<TARGET_FILE:fdb_c_shim_unit_tests> -- --api-tester-bin $<TARGET_FILE:fdb_c_shim_api_tester> -- --shim-lib-tester-bin $<TARGET_FILE:fdb_c_shim_lib_tester> -- --api-test-dir ${CMAKE_SOURCE_DIR}/bindings/c/test/apitester/tests -- ${SHIM_LIB_TEST_EXTRA_OPTIONS} -- ) - - endif() # End Linux only - diff --git a/databases/foundationdb73-server/files/patch-bindings_c_test_apitester_TesterWorkload.cpp b/databases/foundationdb73-server/files/patch-bindings_c_test_apitester_TesterWorkload.cpp deleted file mode 100644 index 0e58990da95d..000000000000 --- a/databases/foundationdb73-server/files/patch-bindings_c_test_apitester_TesterWorkload.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- bindings/c/test/apitester/TesterWorkload.cpp.orig 2023-11-07 15:13:56 UTC -+++ bindings/c/test/apitester/TesterWorkload.cpp -@@ -172,7 +172,7 @@ void WorkloadBase::error(const std::string& msg) { - fmt::print(stderr, "[{}] ERROR: {}\n", workloadId, msg); - numErrors++; - if (numErrors > maxErrors && !failed) { -- fmt::print(stderr, "[{}] ERROR: Stopping workload after {} errors\n", workloadId, numErrors); -+ fmt::print(stderr, "[{}] ERROR: Stopping workload after {} errors\n", workloadId, numErrors.load()); - failed = true; - } - } diff --git a/databases/foundationdb73-server/files/patch-bindings_c_test_mako_mako.cpp b/databases/foundationdb73-server/files/patch-bindings_c_test_mako_mako.cpp deleted file mode 100644 index fb8018344a8f..000000000000 --- a/databases/foundationdb73-server/files/patch-bindings_c_test_mako_mako.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- bindings/c/test/mako/mako.cpp.orig 2023-11-07 15:13:56 UTC -+++ bindings/c/test/mako/mako.cpp -@@ -2378,7 +2378,7 @@ int statsProcessMain(Arguments const& args, - fmt::fprintf(fp, "\"txntrace\": %d,", args.txntrace); - fmt::fprintf(fp, "\"txntagging\": %d,", args.txntagging); - fmt::fprintf(fp, "\"txntagging_prefix\": \"%s\",", args.txntagging_prefix); -- fmt::fprintf(fp, "\"streaming_mode\": %d,", args.streaming_mode); -+ fmt::fprintf(fp, "\"streaming_mode\": %d,", static_cast<int>(args.streaming_mode)); - fmt::fprintf(fp, "\"disable_ryw\": %d,", args.disable_ryw); - fmt::fprintf(fp, "\"transaction_timeout_db\": %d,", args.transaction_timeout_db); - fmt::fprintf(fp, "\"transaction_timeout_tx\": %d,", args.transaction_timeout_tx); diff --git a/databases/foundationdb73-server/files/patch-cmake_CompileBoost.cmake b/databases/foundationdb73-server/files/patch-cmake_CompileBoost.cmake deleted file mode 100644 index 4da2a7dccdf1..000000000000 --- a/databases/foundationdb73-server/files/patch-cmake_CompileBoost.cmake +++ /dev/null @@ -1,20 +0,0 @@ ---- cmake/CompileBoost.cmake.orig 2023-06-01 02:57:35 UTC -+++ cmake/CompileBoost.cmake -@@ -123,7 +123,7 @@ if(USE_SANITIZER) - endif() - - # since boost 1.72 boost installs cmake configs. We will enforce config mode --set(Boost_USE_STATIC_LIBS ON) -+set(Boost_USE_STATIC_LIBS OFF) - - # Clang and Gcc will have different name mangling to std::call_once, etc. - if (UNIX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang$") -@@ -151,7 +151,7 @@ if(WIN32) - return() - endif() - --find_package(Boost 1.78.0 EXACT QUIET COMPONENTS context filesystem iostreams serialization system CONFIG PATHS ${BOOST_HINT_PATHS}) -+find_package(Boost 1.78.0 COMPONENTS context filesystem iostreams serialization system CONFIG PATHS ${BOOST_HINT_PATHS}) - set(FORCE_BOOST_BUILD OFF CACHE BOOL "Forces cmake to build boost and ignores any installed boost") - - # The precompiled boost silently broke in CI. While investigating, I considered extending diff --git a/databases/foundationdb73-server/files/patch-cmake_FDBComponents.cmake b/databases/foundationdb73-server/files/patch-cmake_FDBComponents.cmake deleted file mode 100644 index c76c27af7604..000000000000 --- a/databases/foundationdb73-server/files/patch-cmake_FDBComponents.cmake +++ /dev/null @@ -1,32 +0,0 @@ ---- cmake/FDBComponents.cmake.orig 2024-01-09 21:06:41 UTC -+++ cmake/FDBComponents.cmake -@@ -24,7 +24,7 @@ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) - # Statically link OpenSSL to FDB, see - # https://cmake.org/cmake/help/v3.24/module/FindOpenSSL.html - # Without the flags, OpenSSL is dynamically linked. --set(OPENSSL_USE_STATIC_LIBS TRUE) -+set(OPENSSL_USE_STATIC_LIBS FALSE) - if (WIN32) - set(OPENSSL_MSVC_STATIC_RT ON) - endif() -@@ -193,6 +193,12 @@ else() - endif() - - ################################################################################ -+# misc optional components -+################################################################################ -+ -+set(WITH_FLOWBENCH OFF) -+ -+################################################################################ - # Coroutine implementation - ################################################################################ - -@@ -236,6 +242,7 @@ function(print_components) - message(STATUS "Build Documentation (make html): ${WITH_DOCUMENTATION}") - message(STATUS "Build Python sdist (make package): ${WITH_PYTHON_BINDING}") - message(STATUS "Configure CTest (depends on Python): ${WITH_PYTHON}") -+ message(STATUS "Build with FlowBench: ${WITH_FLOWBENCH}") - message(STATUS "Build with RocksDB: ${WITH_ROCKSDB_EXPERIMENTAL}") - message(STATUS "Build with AWS SDK: ${WITH_AWS_BACKUP}") - message(STATUS "=========================================") diff --git a/databases/foundationdb73-server/files/patch-cmake_GetMsgpack.cmake b/databases/foundationdb73-server/files/patch-cmake_GetMsgpack.cmake deleted file mode 100644 index adfc467bd72b..000000000000 --- a/databases/foundationdb73-server/files/patch-cmake_GetMsgpack.cmake +++ /dev/null @@ -1,17 +0,0 @@ ---- cmake/GetMsgpack.cmake.orig 2023-09-26 04:25:05 UTC -+++ cmake/GetMsgpack.cmake -@@ -1,9 +1,13 @@ - find_package(msgpack 3.3.0 EXACT QUIET CONFIG) -+find_package(msgpackc-cxx 4.0.0...<6 QUIET CONFIG) -+find_package(msgpack-cxx 6 QUIET CONFIG) - - add_library(msgpack INTERFACE) - --if(msgpack_FOUND) -+if(msgpack_FOUND OR msgpackc-cxx_FOUND) - target_link_libraries(msgpack INTERFACE msgpackc-cxx) -+elseif(msgpack-cxx_FOUND) -+ target_link_libraries(msgpack INTERFACE msgpack-cxx) - else() - include(ExternalProject) - ExternalProject_add(msgpackProject diff --git a/databases/foundationdb73-server/files/patch-fdbcli_CMakeLists.txt b/databases/foundationdb73-server/files/patch-fdbcli_CMakeLists.txt deleted file mode 100644 index 7289dd326b82..000000000000 --- a/databases/foundationdb73-server/files/patch-fdbcli_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- fdbcli/CMakeLists.txt.orig 2024-01-09 21:06:41 UTC -+++ fdbcli/CMakeLists.txt -@@ -25,7 +25,7 @@ if(NOT OPEN_FOR_IDE) - endif() - endif() - --if (NOT WIN32 AND NOT OPEN_FOR_IDE) -+if(FALSE) - add_dependencies(fdbcli external_client) - - add_fdbclient_test( diff --git a/databases/foundationdb73-server/files/patch-fdbclient_SpecialKeySpace.actor.cpp b/databases/foundationdb73-server/files/patch-fdbclient_SpecialKeySpace.actor.cpp deleted file mode 100644 index f86c7a1f6387..000000000000 --- a/databases/foundationdb73-server/files/patch-fdbclient_SpecialKeySpace.actor.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- fdbclient/SpecialKeySpace.actor.cpp.orig 2023-11-07 15:13:56 UTC -+++ fdbclient/SpecialKeySpace.actor.cpp -@@ -2996,7 +2996,7 @@ ACTOR Future<Void> validateSpecialSubrangeRead(ReadYou - // Test - RangeResult testResult = wait(ryw->getRange(testBegin, testEnd, limits, Snapshot::True, reverse)); - if (testResult != expectedResult) { -- fmt::print("Reverse: {}\n", reverse); -+ fmt::print("Reverse: {}\n", static_cast<bool>(reverse)); - fmt::print("Original range: [{}, {})\n", begin.toString(), end.toString()); - fmt::print("Original result:\n"); - for (const auto& kr : result) { diff --git a/databases/foundationdb73-server/files/patch-fdbmonitor_CMakeLists.txt b/databases/foundationdb73-server/files/patch-fdbmonitor_CMakeLists.txt deleted file mode 100644 index 032c67f6976c..000000000000 --- a/databases/foundationdb73-server/files/patch-fdbmonitor_CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- fdbmonitor/CMakeLists.txt.orig 2024-01-09 21:06:41 UTC -+++ fdbmonitor/CMakeLists.txt -@@ -62,4 +62,4 @@ endif() - add_custom_target(generate_profile - COMMAND ${CMAKE_BINARY_DIR}/contrib/generate_profile.sh ${CMAKE_BINARY_DIR}) - --add_dependencies(generate_profile fdbmonitor fdbserver mako fdbcli) -+add_dependencies(generate_profile fdbmonitor fdbserver fdbcli) diff --git a/databases/foundationdb73-server/files/patch-fdbmonitor_fdbmonitor.cpp b/databases/foundationdb73-server/files/patch-fdbmonitor_fdbmonitor.cpp deleted file mode 100644 index 8d9420cb36aa..000000000000 --- a/databases/foundationdb73-server/files/patch-fdbmonitor_fdbmonitor.cpp +++ /dev/null @@ -1,44 +0,0 @@ ---- fdbmonitor/fdbmonitor.cpp.orig 2024-01-09 21:06:41 UTC -+++ fdbmonitor/fdbmonitor.cpp -@@ -27,6 +27,8 @@ - - #ifdef __linux__ - #include <sys/prctl.h> -+#elif defined(__FreeBSD__) -+#include<sys/procctl.h> - #endif - - #include <sys/wait.h> -@@ -758,7 +760,10 @@ void start_process(Command* cmd, ProcessID id, uid_t u - signal(SIGHUP, SIG_DFL); - signal(SIGINT, SIG_DFL); - signal(SIGTERM, SIG_DFL); -- -+#ifdef __linux__ -+ signal(SIGCHLD, SIG_DFL); -+#endif -+ sigprocmask(SIG_SETMASK, mask, nullptr); - /* All output in this block should be to stdout (for SevInfo messages) or stderr (for SevError messages) */ - /* Using log_msg() or log_err() from the child will cause the logs to be written incorrectly */ - dup2(cmd->pipes[0][1], fileno(stdout)); -@@ -787,14 +792,16 @@ void start_process(Command* cmd, ProcessID id, uid_t u - } - - #ifdef __linux__ -- signal(SIGCHLD, SIG_DFL); -- -- sigprocmask(SIG_SETMASK, mask, nullptr); -- - /* death of our parent raises SIGHUP */ - prctl(PR_SET_PDEATHSIG, SIGHUP); - if (getppid() == 1) /* parent already died before prctl */ - exit(0); -+#elif defined(__FreeBSD__) -+ /* death of our parent raises SIGHUP */ -+ const int sig = SIGHUP; -+ procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void*)&sig); -+ if (getppid() == 1) /* parent already died before procctl */ -+ exit(0); - #endif - - if (delay) diff --git a/databases/foundationdb73-server/files/patch-fdbserver_BlobWorker.actor.cpp b/databases/foundationdb73-server/files/patch-fdbserver_BlobWorker.actor.cpp deleted file mode 100644 index 40a93448f5da..000000000000 --- a/databases/foundationdb73-server/files/patch-fdbserver_BlobWorker.actor.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- fdbserver/BlobWorker.actor.cpp.orig 2023-11-07 15:13:56 UTC -+++ fdbserver/BlobWorker.actor.cpp -@@ -585,8 +585,8 @@ ACTOR Future<Void> updateGranuleSplitState(Transaction - fmt::print("Updating granule {0} split state from {1} {2} -> {3}\n", - currentGranuleID.toString(), - parentGranuleID.toString(), -- currentState, -- newState); -+ static_cast<int>(currentState), -+ static_cast<int>(newState)); - } - - Key myStateKey = blobGranuleSplitKeyFor(parentGranuleID, currentGranuleID); -@@ -631,8 +631,8 @@ ACTOR Future<Void> updateGranuleSplitState(Transaction - fmt::print("Ignoring granule {0} split state from {1} {2} -> {3}\n", - currentGranuleID.toString(), - parentGranuleID.toString(), -- currentState, -- newState); -+ static_cast<int>(currentState), -+ static_cast<int>(newState)); - } - - return Void(); -@@ -5422,7 +5422,7 @@ ACTOR Future<Void> blobWorkerCore(BlobWorkerInterface - assignReq.keyRange.end.printable(), - assignReq.managerEpoch, - assignReq.managerSeqno, -- assignReq.type); -+ static_cast<int>(assignReq.type)); - } - - if (self->managerEpochOk(assignReq.managerEpoch)) { diff --git a/databases/foundationdb73-server/files/patch-fdbserver_storageserver.actor.cpp b/databases/foundationdb73-server/files/patch-fdbserver_storageserver.actor.cpp deleted file mode 100644 index 2cc5fe7680b4..000000000000 --- a/databases/foundationdb73-server/files/patch-fdbserver_storageserver.actor.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- fdbserver/storageserver.actor.cpp.orig 2024-01-09 21:06:41 UTC -+++ fdbserver/storageserver.actor.cpp -@@ -3615,7 +3615,7 @@ ACTOR Future<std::pair<ChangeFeedStreamReply, bool>> g - req.rangeID.printable().substr(0, 6), - req.id.toString().substr(0, 8), - foundVersion ? "key" : "version", -- DEBUG_CF_MISSING_VERSION, -+ static_cast<int64_t>(DEBUG_CF_MISSING_VERSION), - req.range.begin.printable(), - req.range.end.printable(), - req.begin, -@@ -3635,7 +3635,7 @@ ACTOR Future<std::pair<ChangeFeedStreamReply, bool>> g - data->thisServerID.toString().substr(0, 4), - req.rangeID.printable().substr(0, 6), - req.id.toString().substr(0, 8), -- DEBUG_CF_MISSING_VERSION, -+ static_cast<int64_t>(DEBUG_CF_MISSING_VERSION), - req.range.begin.printable(), - req.range.end.printable(), - req.begin, diff --git a/databases/foundationdb73-server/files/patch-flow_MkCertCli.cpp b/databases/foundationdb73-server/files/patch-flow_MkCertCli.cpp deleted file mode 100644 index 5bf38da98632..000000000000 --- a/databases/foundationdb73-server/files/patch-flow_MkCertCli.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- flow/MkCertCli.cpp.orig 2023-11-07 15:13:56 UTC -+++ flow/MkCertCli.cpp -@@ -216,7 +216,7 @@ int main(int argc, char** argv) { - fmt::print(stderr, "ERROR: unknown option '{}'\n", args.OptionText()); - return FDB_EXIT_ERROR; - default: -- fmt::print(stderr, "ERROR: unknown error {} with option '{}'\n", err, args.OptionText()); -+ fmt::print(stderr, "ERROR: unknown error {} with option '{}'\n", static_cast<int>(err), args.OptionText()); - return FDB_EXIT_ERROR; - } - } else { diff --git a/databases/foundationdb73-server/files/patch-flow_Platform.actor.cpp b/databases/foundationdb73-server/files/patch-flow_Platform.actor.cpp deleted file mode 100644 index fb60185e28d0..000000000000 --- a/databases/foundationdb73-server/files/patch-flow_Platform.actor.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- flow/Platform.actor.cpp.orig 2023-09-26 04:25:05 UTC -+++ flow/Platform.actor.cpp -@@ -1979,6 +1979,9 @@ std::string epochsToGMTString(double epochs) { - } - - std::vector<std::string> getEnvironmentKnobOptions() { -+#if defined(__FreeBSD__) -+ extern char** environ; -+#endif - constexpr const size_t ENVKNOB_PREFIX_LEN = sizeof(ENVIRONMENT_KNOB_OPTION_PREFIX) - 1; - std::vector<std::string> knobOptions; - #if defined(_WIN32) -@@ -1994,7 +1997,7 @@ std::vector<std::string> getEnvironmentKnobOptions() { - } - #else - char** e = nullptr; --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - e = environ; - #elif defined(__APPLE__) - e = *_NSGetEnviron(); |