Skip to content

[COR] Unify Provider Steps #22144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
markuspf wants to merge 9 commits into from
+68 −122
Closed

[COR] Unify Provider Steps #22144

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bf89601
Remove cursorID from Steps
markuspf Nov 27, 2025
9a74fbf
Use type alias and remove unused function
markuspf Nov 28, 2025
12fa0a1
Simplify Step code
markuspf Nov 28, 2025
17c8d09
Clean up includes
markuspf Nov 28, 2025
e4abe36
Simplify Step code
markuspf Nov 28, 2025
f8f0104
Simplify Step code
markuspf Nov 28, 2025
2d53f04
Simplify Step code even more
markuspf Nov 28, 2025
d7e1d2c
Fix tests
markuspf Nov 28, 2025
b21a045
restore isValid
markuspf Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify Step code
  • Loading branch information
@markuspf
markuspf committed Nov 28, 2025
commit 12fa0a17fa35ff54ee49e3d38d1eb16ee83f6552
6 changes: 3 additions & 3 deletions arangod/Graph/PathManagement/PathValidator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ auto PathValidator<ProviderType, PathStore, vertexUniqueness, edgeUniqueness>::
bool success = _store.visitReversePath(
step, [&](typename PathStore::Step const& step) -> bool {
auto const& [unusedV, addedVertex] =
_uniqueVertices.emplace(step.getVertexIdentifier());
_uniqueVertices.emplace(step.getVertex().getID());

// If this add fails, we need to exclude this path
return addedVertex;
Expand All @@ -101,7 +101,7 @@ auto PathValidator<ProviderType, PathStore, vertexUniqueness, edgeUniqueness>::
// In case we have VertexUniquenessLevel::GLOBAL, we do not have to take
// care about the EdgeUniquenessLevel.
auto const& [unusedV, addedVertex] =
_uniqueVertices.emplace(step.getVertexIdentifier());
_uniqueVertices.emplace(step.getVertex().getID());
// If this add fails, we need to exclude this path
if (!addedVertex) {
return ValidationResult::Type::FILTER_AND_PRUNE;
Expand Down Expand Up @@ -186,7 +186,7 @@ auto PathValidator<ProviderType, PathStore, vertexUniqueness, edgeUniqueness>::
// If otherUniqueVertices has our step, we will return false and
// abort. Otherwise we'll return true here. This guarantees we have no
// vertex on both sides of the path twice.
return otherUniqueVertices.find(innerStep.getVertexIdentifier()) ==
return otherUniqueVertices.find(innerStep.getVertex().getID()) ==
otherUniqueVertices.end();
});
if (!success) {
Expand Down