From 4184a467d9eee90600ddcbf34d896c763e76f78f Mon Sep 17 00:00:00 2001
From: Julien Jerphanion <git@jjerphan.xyz>
Date: Mon, 11 Mar 2024 13:12:05 +0100
Subject: [PATCH] maint: Remove dependency on some elements of folly (#1370)

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Georgi Petrov <32372905+G-D-Petrov@users.noreply.github.com>
---
 cpp/arcticdb/entity/performance_tracing.cpp           |  3 +--
 cpp/arcticdb/pipeline/index_segment_reader.hpp        |  6 ------
 cpp/arcticdb/pipeline/read_frame.cpp                  | 11 +++++------
 cpp/arcticdb/pipeline/read_pipeline.hpp               |  1 -
 cpp/arcticdb/pipeline/value_set.hpp                   |  3 +--
 .../processing/test/test_component_manager.cpp        |  1 -
 cpp/arcticdb/storage/library_path.hpp                 |  6 ++----
 cpp/arcticdb/stream/aggregator.hpp                    |  2 --
 cpp/arcticdb/stream/row_builder.hpp                   |  1 -
 cpp/arcticdb/stream/stream_utils.hpp                  |  1 -
 cpp/arcticdb/stream/test/test_aggregator.cpp          |  1 -
 cpp/arcticdb/stream/test/test_row_builder.cpp         |  1 -
 cpp/arcticdb/version/version_map_batch_methods.hpp    |  2 +-
 13 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/cpp/arcticdb/entity/performance_tracing.cpp b/cpp/arcticdb/entity/performance_tracing.cpp
index eb3c5e0d5f..5d16bb8d16 100644
--- a/cpp/arcticdb/entity/performance_tracing.cpp
+++ b/cpp/arcticdb/entity/performance_tracing.cpp
@@ -9,7 +9,6 @@
 #include <arcticdb/entity/performance_tracing.hpp>
 #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>
 
@@ -61,7 +60,7 @@ RemoteryInstance::~RemoteryInstance() {
 
 namespace arcticdb::detail {
     struct ThreadNameCache {
-        folly::F14FastMap<const char *, std::string> fqn_by_task_name_;
+        std::unordered_map<const char *, std::string> fqn_by_task_name_;
         std::string thread_name_;
 
         ThreadNameCache():fqn_by_task_name_(),thread_name_(folly::getCurrentThreadName().value_or("Thread")){}
diff --git a/cpp/arcticdb/pipeline/index_segment_reader.hpp b/cpp/arcticdb/pipeline/index_segment_reader.hpp
index 92c2ff34b7..63496e80fd 100644
--- a/cpp/arcticdb/pipeline/index_segment_reader.hpp
+++ b/cpp/arcticdb/pipeline/index_segment_reader.hpp
@@ -11,7 +11,6 @@
 #include <arcticdb/entity/protobufs.hpp>
 #include <arcticdb/pipeline/frame_slice.hpp>
 #include <arcticdb/pipeline/index_fields.hpp>
-#include <folly/container/F14Map.h>
 
 #include <boost/noncopyable.hpp>
 
@@ -82,12 +81,7 @@ struct IndexSegmentReader {
     }
 
 private:
-#ifndef _WIN32
-    mutable folly::F14FastMap<ColRange, std::shared_ptr<StreamDescriptor>, AxisRange::Hasher> descriptor_by_col_group_;
-#else
-    //TODO: Fix this for windows - folly complains regarding private inheritance
     mutable std::unordered_map<ColRange, std::shared_ptr<StreamDescriptor>, AxisRange::Hasher> descriptor_by_col_group_;
-#endif
     SegmentInMemory seg_;
     TimeseriesDescriptor tsd_;
 };
diff --git a/cpp/arcticdb/pipeline/read_frame.cpp b/cpp/arcticdb/pipeline/read_frame.cpp
index 08d1d8b617..a7d63f3407 100644
--- a/cpp/arcticdb/pipeline/read_frame.cpp
+++ b/cpp/arcticdb/pipeline/read_frame.cpp
@@ -27,7 +27,6 @@
 #include <arcticdb/codec/variant_encoded_field_collection.hpp>
 #include <arcticdb/util/magic_num.hpp>
 #include <google/protobuf/util/message_differencer.h>
-#include <folly/SpinLock.h>
 #include <folly/gen/Base.h>
 #include <folly/concurrency/ConcurrentHashMap.h>
 
@@ -642,7 +641,7 @@ class StringReducer {
     virtual void reduce(PipelineContextRow& context_row, size_t column_index) = 0;
 };
 
-using LockType = folly::SpinLock;
+using LockType = std::mutex;
 
 class EmptyDynamicStringReducer {
 protected:
@@ -884,7 +883,7 @@ class DynamicStringReducer : public StringReducer {
         auto none = std::make_unique<py::none>(py::none{});
         LockPolicy::unlock(*lock_);
         size_t none_count = 0u;
-        ankerl::unordered_dense::map<entity::position_t, std::pair<PyObject*, folly::SpinLock>> local_map;
+        ankerl::unordered_dense::map<entity::position_t, std::pair<PyObject*, std::unique_ptr<std::mutex>>> local_map;
         local_map.reserve(end - row_);
         // TODO this is no good for non-contigous blocks, but we currently expect
         // output data to be contiguous
@@ -901,16 +900,16 @@ class DynamicStringReducer : public StringReducer {
                 if(it != local_map.end()) {
                     auto& object_and_lock = it->second;
                     *ptr_dest_ = object_and_lock.first;
-                    LockPolicy::lock(object_and_lock.second);
+                    LockPolicy::lock(*object_and_lock.second);
                     Py_INCREF(*ptr_dest_);
-                    LockPolicy::unlock(object_and_lock.second);
+                    LockPolicy::unlock(*object_and_lock.second);
                 } else {
                     const auto sv = get_string_from_pool(offset, string_pool);
                     LockPolicy::lock(*lock_);
                     *ptr_dest_ = StringCreator::create(sv, has_type_conversion);
                     LockPolicy::unlock(*lock_);
                     PyObject* dest = *ptr_dest_;
-                    local_map.insert(std::make_pair(std::move(offset), std::make_pair(std::move(dest), folly::SpinLock{})));
+                    local_map.insert(std::make_pair(std::move(offset), std::make_pair(std::move(dest), std::make_unique<std::mutex>())));
                 }
             }
         }
diff --git a/cpp/arcticdb/pipeline/read_pipeline.hpp b/cpp/arcticdb/pipeline/read_pipeline.hpp
index 22896dc31a..b0dc0349d4 100644
--- a/cpp/arcticdb/pipeline/read_pipeline.hpp
+++ b/cpp/arcticdb/pipeline/read_pipeline.hpp
@@ -10,7 +10,6 @@
 #include <variant>
 
 #include <folly/futures/Future.h>
-#include <folly/container/F14Set.h>
 #include <boost/noncopyable.hpp>
 
 #include <arcticdb/entity/types.hpp>
diff --git a/cpp/arcticdb/pipeline/value_set.hpp b/cpp/arcticdb/pipeline/value_set.hpp
index 59200d7be6..6a8ec3cbce 100644
--- a/cpp/arcticdb/pipeline/value_set.hpp
+++ b/cpp/arcticdb/pipeline/value_set.hpp
@@ -14,7 +14,6 @@
 #include <variant>
 #include <vector>
 
-#include <folly/container/F14Map.h>
 #include <pybind11/numpy.h>
 
 #include <arcticdb/entity/types.hpp>
@@ -98,7 +97,7 @@ class ValueSet {
     };
 
     std::shared_ptr<std::unordered_set<std::string>> typed_set_string_;
-    folly::F14FastMap<size_t, std::shared_ptr<std::unordered_set<std::string>>> typed_set_fixed_width_strings_;
+    std::unordered_map<size_t, std::shared_ptr<std::unordered_set<std::string>>> typed_set_fixed_width_strings_;
 
     typed_set<uint8_t> typed_set_uint8_t_;
     typed_set<uint16_t> typed_set_uint16_t_;
diff --git a/cpp/arcticdb/processing/test/test_component_manager.cpp b/cpp/arcticdb/processing/test/test_component_manager.cpp
index 215f3221c6..181e060435 100644
--- a/cpp/arcticdb/processing/test/test_component_manager.cpp
+++ b/cpp/arcticdb/processing/test/test_component_manager.cpp
@@ -5,7 +5,6 @@
  * 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.
  */
 
-#include <folly/executors/ThreadedExecutor.h>
 #include <gtest/gtest.h>
 
 #include <arcticdb/processing/component_manager.hpp>
diff --git a/cpp/arcticdb/storage/library_path.hpp b/cpp/arcticdb/storage/library_path.hpp
index 012a79184f..fcef9d314e 100644
--- a/cpp/arcticdb/storage/library_path.hpp
+++ b/cpp/arcticdb/storage/library_path.hpp
@@ -10,7 +10,7 @@
 #include <arcticdb/util/hash.hpp>
 #include <arcticdb/util/name_validation.hpp>
 
-#include <folly/small_vector.h>
+#include <boost/container/small_vector.hpp>
 #include <folly/Range.h>
 #include <fmt/format.h>
 #include <memory>
@@ -44,8 +44,6 @@ class DefaultStringViewable : public std::shared_ptr<std::string> {
         return hash_;
     }
 
-    DefaultStringViewable operator=(const DefaultStringViewable&) = delete;
-
   private:
    HashedValue hash_;
 };
@@ -152,7 +150,7 @@ class LibraryPathImpl {
         return accum.digest();
     }
 
-    folly::small_vector<StringViewable, NUM_LIBRARY_PARTS> parts_;
+    boost::container::small_vector<StringViewable, NUM_LIBRARY_PARTS> parts_;
     HashedValue hash_;
 };
 
diff --git a/cpp/arcticdb/stream/aggregator.hpp b/cpp/arcticdb/stream/aggregator.hpp
index 9e5db51ae4..434b5fc98d 100644
--- a/cpp/arcticdb/stream/aggregator.hpp
+++ b/cpp/arcticdb/stream/aggregator.hpp
@@ -12,8 +12,6 @@
 #include <arcticdb/column_store/memory_segment.hpp>
 #include <arcticdb/util/constants.hpp>
 
-#include <folly/ScopeGuard.h>
-
 #include <memory>
 
 namespace arcticdb::stream {
diff --git a/cpp/arcticdb/stream/row_builder.hpp b/cpp/arcticdb/stream/row_builder.hpp
index ade422f531..c0c79f44c0 100644
--- a/cpp/arcticdb/stream/row_builder.hpp
+++ b/cpp/arcticdb/stream/row_builder.hpp
@@ -21,7 +21,6 @@
 
 #include <folly/Range.h>
 #include <folly/Function.h>
-#include <folly/ScopeGuard.h>
 
 #include <typeinfo>
 
diff --git a/cpp/arcticdb/stream/stream_utils.hpp b/cpp/arcticdb/stream/stream_utils.hpp
index 4cbebc8dde..95b15a8f5b 100644
--- a/cpp/arcticdb/stream/stream_utils.hpp
+++ b/cpp/arcticdb/stream/stream_utils.hpp
@@ -23,7 +23,6 @@
 #include <folly/Function.h>
 #include <folly/Range.h>
 #include <folly/futures/Future.h>
-#include <folly/Likely.h>
 #include <boost/circular_buffer.hpp>
 
 #include <optional>
diff --git a/cpp/arcticdb/stream/test/test_aggregator.cpp b/cpp/arcticdb/stream/test/test_aggregator.cpp
index 406565f3df..ead376d72f 100644
--- a/cpp/arcticdb/stream/test/test_aggregator.cpp
+++ b/cpp/arcticdb/stream/test/test_aggregator.cpp
@@ -8,7 +8,6 @@
 #include <arcticdb/stream/row_builder.hpp>
 #include <arcticdb/stream/aggregator.hpp>
 
-#include <folly/ScopeGuard.h>
 #include <gtest/gtest.h>
 
 #include <memory>
diff --git a/cpp/arcticdb/stream/test/test_row_builder.cpp b/cpp/arcticdb/stream/test/test_row_builder.cpp
index 44c2e7501a..b7c2a79298 100644
--- a/cpp/arcticdb/stream/test/test_row_builder.cpp
+++ b/cpp/arcticdb/stream/test/test_row_builder.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <gtest/gtest.h>
-#include <folly/ScopeGuard.h>
 
 #include <arcticdb/stream/row_builder.hpp>
 #include <arcticdb/stream/aggregator.hpp>
diff --git a/cpp/arcticdb/version/version_map_batch_methods.hpp b/cpp/arcticdb/version/version_map_batch_methods.hpp
index 6b98fb93b6..e6b77b78b2 100644
--- a/cpp/arcticdb/version/version_map_batch_methods.hpp
+++ b/cpp/arcticdb/version/version_map_batch_methods.hpp
@@ -269,7 +269,7 @@ inline std::shared_ptr<std::unordered_map<std::pair<StreamId, VersionId>, AtomKe
 struct StreamVersionData {
     size_t count_ = 0;
     LoadParameter load_param_ = LoadParameter{LoadType::NOT_LOADED};
-    folly::small_vector<SnapshotId, 1> snapshots_;
+    boost::container::small_vector<SnapshotId, 1> snapshots_;
 
     explicit StreamVersionData(const pipelines::VersionQuery& version_query);
     StreamVersionData() = default;