Move extractCollectionName into VertexRef

markuspf · markuspf · commit 65b6bad8751f · 2025-12-09T20:10:20.000Z
diff --git a/arangod/Graph/Helpers/CMakeLists.txt b/arangod/Graph/Helpers/CMakeLists.txt
@@ -1,3 +1,2 @@
 target_sources(arango_graph PRIVATE
-  ExtractCollectionName.cpp
   TraceEntry.cpp)
diff --git a/arangod/Graph/Helpers/ExtractCollectionName.cpp b/arangod/Graph/Helpers/ExtractCollectionName.cpp
diff --git a/arangod/Graph/Helpers/ExtractCollectionName.h b/arangod/Graph/Helpers/ExtractCollectionName.h
diff --git a/arangod/Graph/PathManagement/PathValidator.cpp b/arangod/Graph/PathManagement/PathValidator.cpp
@@ -34,7 +34,6 @@
 #include "Graph/Steps/SingleServerProviderStep.h"
 #include "Graph/Types/ValidationResult.h"
 #include "Transaction/Helpers.h"
-#include "Graph/Helpers/ExtractCollectionName.h"
 
 #ifdef USE_ENTERPRISE
 #include "Enterprise/Graph/Steps/SmartGraphStep.h"
@@ -257,9 +256,13 @@ auto PathValidator<ProviderType, PathStore, vertexUniqueness, edgeUniqueness>::
     return true;
   }
 
-  auto collectionName = extractCollectionNameOrThrow(step.getVertex().getID());
+  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/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;
 };

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`target_sources(arango_graph PRIVATE`
`2`		`- ExtractCollectionName.cpp`
`3`	`2`	`TraceEntry.cpp)`