diff --git a/cmake/FDBComponents.cmake b/cmake/FDBComponents.cmake index fd5c8e015c..3ebf8e8716 100644 --- a/cmake/FDBComponents.cmake +++ b/cmake/FDBComponents.cmake @@ -165,7 +165,7 @@ endif() # RocksDB ################################################################################ -set(SSD_ROCKSDB_EXPERIMENTAL ON CACHE BOOL "Build with experimental RocksDB support") +set(WITH_ROCKSDB ON CACHE BOOL "Build with experimental RocksDB support") set(PORTABLE_ROCKSDB ON CACHE BOOL "Compile RocksDB in portable mode") # Set this to OFF to compile RocksDB with `-march=native` set(ROCKSDB_SSE42 OFF CACHE BOOL "Compile RocksDB with SSE42 enabled") set(ROCKSDB_AVX ${USE_AVX} CACHE BOOL "Compile RocksDB with AVX enabled") @@ -245,7 +245,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 RocksDB: ${SSD_ROCKSDB_EXPERIMENTAL}") + message(STATUS "Build with RocksDB: ${WITH_ROCKSDB}") message(STATUS "Build with AWS SDK: ${WITH_AWS_BACKUP}") message(STATUS "=========================================") endfunction() diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt index cdd4f9c502..3f353c2ef3 100644 --- a/fdbserver/CMakeLists.txt +++ b/fdbserver/CMakeLists.txt @@ -7,7 +7,7 @@ else() endif() -if(SSD_ROCKSDB_EXPERIMENTAL) +if(WITH_ROCKSDB) include(CompileRocksDB) # CompileRocksDB sets `lz4_LIBRARIES` to be the shared lib, we want to link # statically, so find the static library here. @@ -139,7 +139,7 @@ target_include_directories(fdbserver PRIVATE ${CMAKE_BINARY_DIR}/bindings/c ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/include) -if (SSD_ROCKSDB_EXPERIMENTAL) +if (WITH_ROCKSDB) add_dependencies(fdbserver rocksdb) if(WITH_LIBURING) target_include_directories(fdbserver PRIVATE ${ROCKSDB_INCLUDE_DIR} ${uring_INCLUDE_DIR}) @@ -159,8 +159,8 @@ if(USE_JEMALLOC) endif() target_link_libraries(fdbserver PRIVATE toml11_target rapidjson) -if(SSD_ROCKSDB_EXPERIMENTAL) - target_compile_definitions(fdbserver PRIVATE SSD_ROCKSDB_EXPERIMENTAL) +if(WITH_ROCKSDB) + target_compile_definitions(fdbserver PRIVATE WITH_ROCKSDB) endif() if (WITH_SWIFT) diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp index d741e1f55b..8cd84cc695 100644 --- a/fdbserver/KeyValueStoreRocksDB.actor.cpp +++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp @@ -19,7 +19,7 @@ */ #include "fdbclient/FDBTypes.h" -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB #include #include @@ -61,7 +61,7 @@ #include #include -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB #include "fdbserver/Knobs.h" #include "fdbserver/IKeyValueStore.h" @@ -69,7 +69,7 @@ #include "flow/actorcompiler.h" // has to be last include -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB // Enforcing rocksdb version. static_assert((ROCKSDB_MAJOR == FDB_ROCKSDB_MAJOR && ROCKSDB_MINOR == FDB_ROCKSDB_MINOR && @@ -2538,23 +2538,23 @@ void RocksDBKeyValueStore::Writer::action(RestoreAction& a) { } // namespace -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB IKeyValueStore* keyValueStoreRocksDB(std::string const& path, UID logID, KeyValueStoreType storeType, bool checkChecksums, bool checkIntegrity) { -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB return new RocksDBKeyValueStore(path, logID); #else TraceEvent(SevError, "RocksDBEngineInitFailure", logID).detail("Reason", "Built without RocksDB"); ASSERT(false); return nullptr; -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB } -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB #include "flow/UnitTest.h" namespace { @@ -2790,4 +2790,4 @@ TEST_CASE("noSim/RocksDB/RangeClear") { } } // namespace -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB diff --git a/fdbserver/KeyValueStoreShardedRocksDB.actor.cpp b/fdbserver/KeyValueStoreShardedRocksDB.actor.cpp index dc59d0896d..4de2e38681 100644 --- a/fdbserver/KeyValueStoreShardedRocksDB.actor.cpp +++ b/fdbserver/KeyValueStoreShardedRocksDB.actor.cpp @@ -1,5 +1,5 @@ #include "fdbclient/FDBTypes.h" -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB #include "fdbclient/KeyRangeMap.h" #include "fdbclient/SystemData.h" @@ -39,14 +39,14 @@ #include #include -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB #include "fdbserver/Knobs.h" #include "fdbserver/IKeyValueStore.h" #include "fdbserver/RocksDBCheckpointUtils.actor.h" #include "flow/actorcompiler.h" // has to be last include -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB // Enforcing rocksdb version. static_assert((ROCKSDB_MAJOR == FDB_ROCKSDB_MAJOR && ROCKSDB_MINOR == FDB_ROCKSDB_MINOR && @@ -3703,23 +3703,23 @@ ACTOR Future testCheckpointRestore(IKeyValueStore* kvStore, std::vector #include #include @@ -29,7 +29,7 @@ #include #include #include -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB #include "fdbclient/FDBTypes.h" #include "fdbclient/NativeAPI.actor.h" @@ -45,7 +45,7 @@ #include "flow/actorcompiler.h" // has to be last include -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB // Enforcing rocksdb version. static_assert((ROCKSDB_MAJOR == FDB_ROCKSDB_MAJOR && ROCKSDB_MINOR == FDB_ROCKSDB_MINOR && @@ -1239,7 +1239,7 @@ ACTOR Future deleteRocksCheckpoint(CheckpointMetaData checkpoint) { wait(delay(0)); return Void(); } -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB int64_t getTotalFetchedBytes(const std::vector& checkpoints) { int64_t totalBytes = 0; @@ -1268,29 +1268,29 @@ int64_t getTotalFetchedBytes(const std::vector& checkpoints) ICheckpointReader* newRocksDBCheckpointReader(const CheckpointMetaData& checkpoint, const CheckpointAsKeyValues checkpointAsKeyValues, UID logId) { -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB const CheckpointFormat format = checkpoint.getFormat(); if (format == DataMoveRocksCF && !checkpointAsKeyValues) { return new RocksDBCFCheckpointReader(checkpoint, logId); } else { return new RocksDBColumnFamilyReader(checkpoint, logId); } -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB return nullptr; } std::unique_ptr newRocksDBSstFileWriter() { -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB std::unique_ptr sstWriter = std::make_unique(); return sstWriter; -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB return nullptr; } std::unique_ptr newCheckpointByteSampleReader(const CheckpointMetaData& checkpoint) { -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB return std::make_unique(checkpoint); -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB return nullptr; } diff --git a/fdbserver/RocksDBLogForwarder.actor.cpp b/fdbserver/RocksDBLogForwarder.actor.cpp index 8bcb51356b..aac5da000d 100644 --- a/fdbserver/RocksDBLogForwarder.actor.cpp +++ b/fdbserver/RocksDBLogForwarder.actor.cpp @@ -18,7 +18,7 @@ * limitations under the License. */ -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB #include "fdbserver/RocksDBLogForwarder.h" #include "flow/network.h" @@ -146,4 +146,4 @@ void RocksDBLogForwarder::Logv(const InfoLogLevel log_level, const char* format, } } -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp index f063a4f24d..4ee92452e9 100644 --- a/fdbserver/SimulatedCluster.actor.cpp +++ b/fdbserver/SimulatedCluster.actor.cpp @@ -78,7 +78,7 @@ bool isSimulatorProcessUnreliable() { namespace { constexpr bool hasRocksDB = -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB true #else false @@ -1803,7 +1803,7 @@ const std::unordered_map STORA const std::vector SIMULATION_STORAGE_ENGINE = { SimulationStorageEngine::SSD, SimulationStorageEngine::MEMORY, SimulationStorageEngine::RADIX_TREE, SimulationStorageEngine::REDWOOD, -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB SimulationStorageEngine::ROCKSDB, SimulationStorageEngine::SHARDED_ROCKSDB, #endif }; @@ -1845,7 +1845,7 @@ SimulationStorageEngine chooseSimulationStorageEngine(const TestConfig& testConf .detail("StorageEngine", static_cast(result)) .detail("Reason", reason) .detail("Excluded", getExcludedStorageEngineTypesInString(testConfig.storageEngineExcludeTypes)) -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB .detail("RocksDBEngineChoosable", true) #else .detail("RocksDBEngineChoosable", false) diff --git a/fdbserver/include/fdbserver/RocksDBLogForwarder.h b/fdbserver/include/fdbserver/RocksDBLogForwarder.h index d8fa01b675..a64239f2fd 100644 --- a/fdbserver/include/fdbserver/RocksDBLogForwarder.h +++ b/fdbserver/include/fdbserver/RocksDBLogForwarder.h @@ -24,7 +24,7 @@ #include #include -#ifdef SSD_ROCKSDB_EXPERIMENTAL +#ifdef WITH_ROCKSDB #include #include "flow/genericactors.actor.h" @@ -95,6 +95,6 @@ public: virtual void Logv(const rocksdb::InfoLogLevel log_level, const char* format, va_list ap); }; -#endif // SSD_ROCKSDB_EXPERIMENTAL +#endif // WITH_ROCKSDB #endif // __ROCKSDB_LOG_FORWARDER_H__ diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 205291e77b..ca1c455571 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -227,7 +227,7 @@ if(WITH_PYTHON) add_fdb_test(TEST_FILES fast/WriteDuringReadClean.toml) add_fdb_test(TEST_FILES noSim/RandomUnitTests.toml UNIT) - if(SSD_ROCKSDB_EXPERIMENTAL) + if(WITH_ROCKSDB) add_fdb_test(TEST_FILES fast/ValidateStorage.toml) add_fdb_test(TEST_FILES noSim/KeyValueStoreRocksDBTest.toml UNIT) add_fdb_test(TEST_FILES noSim/ShardedRocksDBTest.toml UNIT)