Use std::filesystem::directory_iterator in fusion runner unit test.

1 files changed, 9 insertions, 16 deletions

diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
index c529c7b78c7..9052d024871 100644
--- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp
+++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
@@ -25,7 +25,6 @@
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/stllike/asciistream.h>
-#include <vespa/fastos/file.h>
 #include <filesystem>
 #include <set>
 
@@ -213,22 +212,16 @@ void Test::createIndex(const string &dir, uint32_t id, bool fusion) {
 
 set<uint32_t> readFusionIds(const string &dir) {
     set<uint32_t> ids;
-    FastOS_DirectoryScan dir_scan(dir.c_str());
-    while (dir_scan.ReadNext()) {
-        if (!dir_scan.IsDirectory()) {
-            continue;
+    const vespalib::string prefix("index.fusion.");
+    std::filesystem::directory_iterator dir_scan(dir);
+    for (auto& entry : dir_scan) {
+        if (entry.is_directory() && entry.path().filename().string().find(prefix) == 0) {
+            auto idString = entry.path().filename().string().substr(prefix.size());
+            vespalib::asciistream ist(idString);
+            uint32_t id;
+            ist >> id;
+            ids.insert(id);
         }
-        vespalib::string name = dir_scan.GetName();
-        const vespalib::string prefix("index.fusion.");
-        vespalib::string::size_type pos = name.find(prefix);
-        if (pos != 0) {
-            continue;
-        }
-        vespalib::string idString = name.substr(prefix.size());
-        vespalib::asciistream ist(idString);
-        uint32_t id;
-        ist >> id;
-        ids.insert(id);
     }
     return ids;
 }