arangodb · markuspf · Dec 8, 2025 · Dec 8, 2025 · Dec 9, 2025 · Dec 9, 2025
diff --git a/arangod/Graph/Enumerators/WeightedTwoSidedEnumerator.h b/arangod/Graph/Enumerators/WeightedTwoSidedEnumerator.h
@@ -255,15 +255,13 @@ class WeightedTwoSidedEnumerator {
       return _haveSeenOtherSide;
     }
 
-    auto setForbiddenVertices(std::shared_ptr<VertexSet> forbidden) -> void
-      requires HasForbidden<PathValidatorType>
-    {
+    auto setForbiddenVertices(std::shared_ptr<VertexSet> forbidden)
+        -> void requires HasForbidden<PathValidatorType> {
       _validator.setForbiddenVertices(std::move(forbidden));
     };
 
-    auto setForbiddenEdges(std::shared_ptr<EdgeSet> forbidden) -> void
-      requires HasForbidden<PathValidatorType>
-    {
+    auto setForbiddenEdges(std::shared_ptr<EdgeSet> forbidden)
+        -> void requires HasForbidden<PathValidatorType> {
       _validator.setForbiddenEdges(std::move(forbidden));
     };
 
@@ -395,22 +393,19 @@ class WeightedTwoSidedEnumerator {
    */
   auto stealStats() -> aql::TraversalStats;
 
-  auto setForbiddenVertices(std::shared_ptr<VertexSet> forbidden) -> void
-    requires HasForbidden<PathValidatorType>
-  {
+  auto setForbiddenVertices(std::shared_ptr<VertexSet> forbidden)
+      -> void requires HasForbidden<PathValidatorType> {
     _left.setForbiddenVertices(forbidden);
     _right.setForbiddenVertices(std::move(forbidden));
   };
 
-  auto setForbiddenEdges(std::shared_ptr<EdgeSet> forbidden) -> void
-    requires HasForbidden<PathValidatorType>
-  {
+  auto setForbiddenEdges(std::shared_ptr<EdgeSet> forbidden)
+      -> void requires HasForbidden<PathValidatorType> {
     _left.setForbiddenEdges(forbidden);
     _right.setForbiddenEdges(std::move(forbidden));
   };
 
- private:
-  [[nodiscard]] auto searchDone() const -> bool;
+ private : [[nodiscard]] auto searchDone() const -> bool;
   // Ensure that we have fetched all vertices in the _results list. Otherwise,
   // we will not be able to generate the resulting path
   auto fetchResults() -> void;

diff --git a/arangod/Graph/PathManagement/PathValidator.cpp b/arangod/Graph/PathManagement/PathValidator.cpp
@@ -256,9 +256,13 @@ auto PathValidator<ProviderType, PathStore, vertexUniqueness, edgeUniqueness>::
     return true;
   }
 
-  auto collectionName = step.getCollectionName();
+  auto collectionNameResult = step.getVertex().collectionName();
+  if (collectionNameResult.fail()) {
+    THROW_ARANGO_EXCEPTION(collectionNameResult.result());
+  }
+
   if (std::find(allowedCollections.begin(), allowedCollections.end(),
-                collectionName) != allowedCollections.end()) {
+                collectionNameResult.get()) != allowedCollections.end()) {
     // found in allowed collections => allowed
     return true;
   }

diff --git a/arangod/Graph/Providers/BaseStep.h b/arangod/Graph/Providers/BaseStep.h
@@ -25,6 +25,7 @@
 
 #include <velocypack/HashedStringRef.h>
 #include "Basics/ResultT.h"
+#include "Basics/Exceptions.h"
 
 #include <numeric>
 
@@ -56,21 +57,6 @@ class BaseStep {
 
   double getWeight() const { return _weight; }
 
-  [[nodiscard]] ResultT<std::pair<std::string, size_t>> extractCollectionName(
-      arangodb::velocypack::HashedStringRef const& idHashed) const {
-    size_t pos = idHashed.find('/');
-    if (pos == std::string::npos) {
-      // Invalid input. If we get here somehow we managed to store invalid
-      // _from/_to values or the traverser did a let an illegal start through
-      TRI_ASSERT(false);
-      return Result{TRI_ERROR_GRAPH_INVALID_EDGE,
-                    "edge contains invalid value " + idHashed.toString()};
-    }
-
-    std::string colName = idHashed.substr(0, pos).toString();
-    return std::make_pair(std::move(colName), pos);
-  }
-
  private:
   size_t _previous;
   size_t _depth;

diff --git a/arangod/Graph/Steps/ClusterProviderStep.h b/arangod/Graph/Steps/ClusterProviderStep.h
@@ -110,14 +110,6 @@ class ClusterProviderStep : public arangodb::graph::BaseStep {
   // beware: returns a *copy* of the edge id
   [[nodiscard]] EdgeType getEdgeIdentifier() const { return _edge.getID(); }
 
-  [[nodiscard]] std::string getCollectionName() const {
-    auto collectionNameResult = extractCollectionName(_vertex.getID());
-    if (collectionNameResult.fail()) {
-      THROW_ARANGO_EXCEPTION(collectionNameResult.result());
-    }
-    return collectionNameResult.get().first;
-  }
-
   friend auto operator<<(std::ostream& out, ClusterProviderStep const& step)
       -> std::ostream&;
 

diff --git a/arangod/Graph/Steps/SingleServerProviderStep.h b/arangod/Graph/Steps/SingleServerProviderStep.h
@@ -79,19 +79,6 @@ class SingleServerProviderStep : public arangodb::graph::BaseStep {
   // beware: will return a *copy* of the edge id
   EdgeType getEdgeIdentifier() const { return _edge.getID(); }
 
-  std::string getCollectionName() const {
-    /*
-     * Future optimization: When re-implementing the documentFastPathLocal
-     * method to support string refs or either string views, we can improve this
-     * section here as well.
-     */
-    auto collectionNameResult = extractCollectionName(_vertex.getID());
-    if (collectionNameResult.fail()) {
-      THROW_ARANGO_EXCEPTION(collectionNameResult.result());
-    }
-    return collectionNameResult.get().first;
-  };
-
   friend auto operator<<(std::ostream& out,
                          SingleServerProviderStep const& step) -> std::ostream&;
 

diff --git a/arangod/Graph/Types/CMakeLists.txt b/arangod/Graph/Types/CMakeLists.txt
@@ -1,3 +1,4 @@
 target_sources(arango_graph PRIVATE
+  VertexRef.cpp
   UniquenessLevel.cpp
   ValidationResult.cpp)
diff --git a/arangod/Graph/Types/VertexRef.h b/arangod/Graph/Types/VertexRef.h
@@ -21,6 +21,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
+#include "Basics/ResultT.h"
+
 #include <velocypack/HashedStringRef.h>
 
 #include <compare>
@@ -57,6 +59,8 @@ class VertexRef {
 
   operator velocypack::HashedStringRef() { return _vertex; }
 
+  [[nodiscard]] auto collectionName() const -> ResultT<std::string_view>;
+
  private:
   RefType _vertex;
 };

diff --git a/tests/Mocks/MockGraphProvider.h b/tests/Mocks/MockGraphProvider.h
@@ -220,14 +220,6 @@ class MockGraphProvider {
       return _edge.getID();
     }
 
-    std::string getCollectionName() const {
-      auto collectionNameResult = extractCollectionName(_vertex.getID());
-      if (collectionNameResult.fail()) {
-        THROW_ARANGO_EXCEPTION(collectionNameResult.result());
-      }
-      return collectionNameResult.get().first;
-    };
-
     void setLocalSchreierIndex(size_t index) {
       TRI_ASSERT(index != std::numeric_limits<size_t>::max());
       TRI_ASSERT(!hasLocalSchreierIndex());