build: Remove some adherence to folly (#1144)

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
man-group · Jan 2, 2024 · 44aaab5 · 44aaab5
1 parent d89a6ef
commit 44aaab5
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 80 deletions.
diff --git a/cpp/arcticdb/CMakeLists.txt b/cpp/arcticdb/CMakeLists.txt
@@ -324,7 +324,6 @@ set(arcticdb_srcs
         util/ref_counted_map.hpp
         util/ref_counted_map.hpp
         util/regex_filter.hpp
-        util/shared_future.hpp
         util/simple_string_hash.hpp
         util/slab_allocator.hpp
         util/sparse_utils.hpp

diff --git a/cpp/arcticdb/entity/metrics.cpp b/cpp/arcticdb/entity/metrics.cpp
@@ -8,11 +8,13 @@
 #include <arcticdb/entity/metrics.hpp>
 #include <arcticdb/log/log.hpp>
 #include <arcticdb/util/preconditions.hpp>
-#include <folly/system/ThreadName.h>
-#include <folly/container/F14Map.h>
 #include <arcticdb/util/preprocess.hpp>
 #include <arcticdb/util/pb_util.hpp>
 
+#ifdef _WIN32
+#    include <Winsock.h> // for gethostname
+#endif
+
 using namespace prometheus;
 
 namespace arcticdb {

diff --git a/cpp/arcticdb/entity/performance_tracing.cpp b/cpp/arcticdb/entity/performance_tracing.cpp
@@ -4,17 +4,15 @@
  *
  * As of the Change Date specified in that file, in accordance with the Business Source License, use of this software will be governed by the Apache License, version 2.0.
  */
+#if defined(USE_REMOTERY)
 
 #include <arcticdb/entity/performance_tracing.hpp>
-#include <folly/Singleton.h>
 #include <arcticdb/log/log.hpp>
 #include <folly/system/ThreadName.h>
 #include <folly/container/F14Map.h>
 #include <arcticdb/util/preprocess.hpp>
 #include <arcticdb/util/pb_util.hpp>
 
-#if defined(USE_REMOTERY)
-
 std::shared_ptr<RemoteryInstance> RemoteryInstance::instance(){
     std::call_once(RemoteryInstance::init_flag_, &RemoteryInstance::init);
     return RemoteryInstance::instance_;
@@ -61,8 +59,6 @@ RemoteryInstance::~RemoteryInstance() {
     }
 }
 
-#endif
-
 namespace arcticdb::detail {
     struct ThreadNameCache {
         folly::F14FastMap<const char *, std::string> fqn_by_task_name_;
@@ -80,8 +76,6 @@ namespace arcticdb::detail {
     };
 }
 
-#ifdef USE_REMOTERY
-
 void set_remotery_thread_name(const char* task_name){
     static thread_local arcticdb::detail::ThreadNameCache tnc;
     auto name = tnc.get_thread_name(task_name);

diff --git a/cpp/arcticdb/pipeline/read_frame.hpp b/cpp/arcticdb/pipeline/read_frame.hpp
@@ -12,7 +12,6 @@
 #include <arcticdb/pipeline/pipeline_context.hpp>
 #include <arcticdb/pipeline/read_options.hpp>
 #include <arcticdb/util/bitset.hpp>
-#include <arcticdb/util/shared_future.hpp>
 #include <arcticdb/util/buffer_holder.hpp>
 
 #include <folly/futures/Future.h>

diff --git a/cpp/arcticdb/python/python_module.cpp b/cpp/arcticdb/python/python_module.cpp
@@ -52,12 +52,6 @@ enum class LoggerId {
     SNAPSHOT
 };
 
-void initialize_folly() {
-    //folly::SingletonVault::singleton()->registrationComplete();
-    auto programName ="__arcticdb_logger__";
-    google::InitGoogleLogging(programName);
-}
-
 void register_log(py::module && log) {
     log.def("configure", [](const py::object & py_log_conf, bool force=false){
         arcticdb::proto::logger::LoggersConfig config;
@@ -307,7 +301,8 @@ PYBIND11_MODULE(arcticdb_ext, m) {
 
         Top level package of ArcticDB extension plugin.
     )pbdoc";
-    initialize_folly();
+    auto programName ="__arcticdb_logger__";
+    google::InitGoogleLogging(programName);
 #ifndef WIN32
     // No fork() in Windows, so no need to register the handler
     pthread_atfork(nullptr, nullptr, &SingleThreadMutexHolder::reset_mutex);

diff --git a/cpp/arcticdb/storage/azure/azure_storage.cpp b/cpp/arcticdb/storage/azure/azure_storage.cpp
@@ -30,7 +30,6 @@
 #include <azure/storage/blobs.hpp>
 
 #include <boost/interprocess/streams/bufferstream.hpp>
-#include <folly/ThreadLocal.h>
 
 #undef GetMessage
 

diff --git a/cpp/arcticdb/storage/library_path.hpp b/cpp/arcticdb/storage/library_path.hpp
@@ -11,7 +11,6 @@
 
 #include <folly/small_vector.h>
 #include <folly/Range.h>
-#include <folly/String.h>
 #include <fmt/format.h>
 #include <memory>
 #include <string>

diff --git a/cpp/arcticdb/storage/lmdb/lmdb_storage.hpp b/cpp/arcticdb/storage/lmdb/lmdb_storage.hpp
@@ -12,7 +12,6 @@
 
 #include <arcticdb/entity/protobufs.hpp>
 
-#include <folly/String.h>
 #include <folly/Range.h>
 #include <arcticdb/util/composite.hpp>
 

diff --git a/cpp/arcticdb/storage/mongo/mongo_instance.cpp b/cpp/arcticdb/storage/mongo/mongo_instance.cpp
@@ -7,8 +7,6 @@
 
 #include <arcticdb/storage/mongo/mongo_instance.hpp>
 
-#include <folly/Singleton.h>
-
 namespace arcticdb::storage::mongo {
 
 void MongoInstance::init() {

diff --git a/cpp/arcticdb/storage/s3/detail-inl.hpp b/cpp/arcticdb/storage/s3/detail-inl.hpp
@@ -26,7 +26,6 @@
 #include <aws/s3/model/ObjectIdentifier.h>
 
 #include <boost/interprocess/streams/bufferstream.hpp>
-#include <folly/ThreadLocal.h>
 
 #undef GetMessage
 

diff --git a/cpp/arcticdb/storage/s3/s3_api.cpp b/cpp/arcticdb/storage/s3/s3_api.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <arcticdb/storage/s3/s3_api.hpp>
-#include <folly/Singleton.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/core/utils/logging/DefaultLogSystem.h>
 #include <aws/core/utils/logging/AWSLogging.h>

diff --git a/cpp/arcticdb/storage/s3/s3_storage.cpp b/cpp/arcticdb/storage/s3/s3_storage.cpp
@@ -38,7 +38,6 @@
 #include <aws/s3/model/ObjectIdentifier.h>
 
 #include <boost/interprocess/streams/bufferstream.hpp>
-#include <folly/ThreadLocal.h>
 
 #include <arcticdb/storage/s3/detail-inl.hpp>
 

diff --git a/cpp/arcticdb/util/configs_map.cpp b/cpp/arcticdb/util/configs_map.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <arcticdb/util/configs_map.hpp>
-#include <folly/Singleton.h>
 
 namespace arcticdb {
 

diff --git a/cpp/arcticdb/util/shared_future.hpp b/cpp/arcticdb/util/shared_future.hpp
diff --git a/cpp/arcticdb/util/storage_lock.hpp b/cpp/arcticdb/util/storage_lock.hpp
@@ -14,7 +14,6 @@
 #include <arcticdb/util/exponential_backoff.hpp>
 #include <arcticdb/util/configs_map.hpp>
 
-#include <folly/portability/PThread.h>
 #include <folly/system/ThreadId.h>
 
 #include <mutex>

diff --git a/cpp/arcticdb/version/test/test_version_store.cpp b/cpp/arcticdb/version/test/test_version_store.cpp
@@ -20,7 +20,6 @@
 #include <filesystem>
 #include <chrono>
 #include <thread>
-#include <folly/futures/Barrier.h>
 
 struct VersionStoreTest : arcticdb::TestStore {
 protected:

diff --git a/cpp/arcticdb/version/version_store_api.hpp b/cpp/arcticdb/version/version_store_api.hpp
@@ -33,8 +33,6 @@
 #include <arcticdb/entity/read_result.hpp>
 #include <arcticdb/version/version_log.hpp>
 
-#include <folly/futures/Barrier.h>
-
 #include <type_traits>
 #include <iostream>
 
@@ -325,15 +323,6 @@ class PythonVersionStore : public LocalVersionedEngine {
 
     void fix_symbol_trees(const std::vector<StreamId>& symbols);
 
-    /**
-     * Main business logic of the DeleteTombstonedData background job. Delete tombstoned versions and snapshots.
-     * @param limit_stream_id Test-specific. If non-empty, limit scope to tombstoned versions in the given stream.
-     * @param min_age_sec Minimum age of index keys that can be deleted in unit of seconds.
-     * @param stresser_sync Only used by stress tests to synchronise steps.
-     */
-    void delete_tombstones(const std::string& limit_stream_id, bool dry_run, uint64_t min_age_sec,
-            folly::futures::Barrier* stresser_sync = nullptr, size_t batch_size = 2000);
-
     std::unordered_map<VersionId, bool> get_all_tombstoned_versions(const StreamId &stream_id);
 
     std::vector<SliceAndKey> list_incompletes(const StreamId& stream_id);