CBD-6348: Changes required to upgrade boost

Remove use of features no available in the new version of boost

Change-Id: I1309e65339b271838e7361bf5d1818e1569df908
Reviewed-on: https://review.couchbase.org/c/kv_engine/+/234654
Tested-by: Trond Norbye <[email protected]>
Reviewed-by: Jim Walker <[email protected]>
Well-Formed: Restriction Checker

Author: trondn

engines/ep/src/ep_engine.cc

@@ -82,6 +82,7 @@
 
 #include <chrono>
 #include <cstring>
+#include <fstream>
 #include <iostream>
 #include <limits>
 #include <memory>
@@ -2009,10 +2010,9 @@ std::optional<size_t> EventuallyPersistentEngine::getShardCountFromDisk() {
     Expects(configuration.getBackend() == "magma");
 
     // Look for the file
-    const auto shardFile = boost::filesystem::path(
-            configuration.getDbname().append(magmaShardFile));
-    if (boost::filesystem::exists(shardFile)) {
-        boost::filesystem::ifstream ifs(shardFile);
+    const auto shardFile = configuration.getDbname().append(magmaShardFile);
+    if (cb::io::isFile(shardFile)) {
+        std::ifstream ifs(shardFile);
         std::string data;
         std::getline(ifs, data);
         EP_LOG_INFO("Found shard file for magma with {} shards", data);
@@ -7261,4 +7261,4 @@ std::string EventuallyPersistentEngine::getDcpDisconnectWhenStuckNameRegex()
 
 bool EventuallyPersistentEngine::isMagmaBlindWriteOptimisationEnabled() const {
     return serverApi->core->isMagmaBlindWriteOptimisationEnabled();
-}
+}

engines/ep/tests/ep_testsuite.cc

@@ -24,7 +24,6 @@
 #include "kvstore/couch-kvstore/couch-kvstore-metadata.h"
 #include "kvstore/storage_common/storage_common/local_doc_constants.h"
 #include "module_tests/thread_gate.h"
-#include <boost/filesystem.hpp>
 #include <executor/executorpool.h>
 #include <libcouchstore/couch_db.h>
 #include <memcached/engine.h>
@@ -43,6 +42,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <filesystem>
 #include <iostream>
 #include <map>
 #include <mutex>
@@ -7790,18 +7790,18 @@ static enum test_result test_mb65737_check_flush_fails(EngineIface* h) {
 
     // db file contains persistenceSeqno = 10
     // Rename couchstore file to simulate loss of data
-    namespace fs = boost::filesystem;
-    std::string dbname = get_dbname(testHarness->get_current_testcase()->cfg);
-    std::string oldFileName = dbname + cb::io::DirectorySeparator + "0.couch.1";
-    std::string newFileName = dbname + cb::io::DirectorySeparator + "goodbye";
+    const std::filesystem::path dbname =
+            get_dbname(testHarness->get_current_testcase()->cfg);
+    const auto oldFileName = dbname / "0.couch.1";
+    const auto newFileName = dbname / "goodbye";
     try {
-        if (!fs::exists(oldFileName)) {
+        if (!exists(oldFileName)) {
             std::cerr << "Error: Source file does not exist: " << oldFileName
                       << '\n';
             return FAIL;
         }
-        fs::rename(oldFileName, newFileName);
-    } catch (const fs::filesystem_error& e) {
+        rename(oldFileName, newFileName);
+    } catch (const std::filesystem::filesystem_error& e) {
         std::cerr << "Error renaming file: " << e.what() << '\n';
         return FAIL;
     }
@@ -7817,10 +7817,10 @@ static enum test_result test_mb65737_check_flush_fails(EngineIface* h) {
     wait_for_warmup_complete(h);
 
     // Bring db file back
-    if (fs::exists(oldFileName)) {
-        fs::remove(oldFileName);
+    if (exists(oldFileName)) {
+        remove(oldFileName);
     }
-    fs::rename(newFileName, oldFileName);
+    rename(newFileName, oldFileName);
 
     // Store 5 items, highSeqno = 5 and persistenceSeqno=10 (from disk)
     write_items(h, 5, 0, keyBase.c_str(), "value", 0, vb);
@@ -7843,8 +7843,8 @@ static enum test_result test_mb65737_check_flush_fails(EngineIface* h) {
             get_int_stat(h, "vb_0:last_persisted_seqno", "vbucket-seqno"),
             "Unexpected last_persisted_seqno");
 
-    fs::remove(oldFileName);
-    fs::create_directories(dbname);
+    remove(oldFileName);
+    create_directories(dbname);
     return SUCCESS;
 }
 

engines/ep/tests/module_tests/kvstore_test.cc

@@ -37,6 +37,7 @@
 #include <executor/workload.h>
 #include <folly/portability/GTest.h>
 #include <platform/dirutils.h>
+#include <fstream>
 #include <thread>
 #include <unordered_map>
 #include <utility>
@@ -1465,7 +1466,7 @@ void KVStoreParamTestSkipRocks::corruptCouchKVStoreDataFile() {
     }
     // manually write nothing to the file as resizing it to 0 using boost
     // fails on windows.
-    fs::ofstream osf{dataFile};
+    std::ofstream osf{dataFile.string()};
     if (osf.is_open()) {
         osf << "";
         osf.close();