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
Closed

[COR] Unify Provider Steps #22144

Show file tree
Hide file tree
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
Fix tests
  • Loading branch information
@markuspf
markuspf committed Nov 28, 2025
commit d7e1d2cca1566fc367ad336035c3934ea9ab9f9d
26 changes: 13 additions & 13 deletions tests/Graph/PathValidatorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ TYPED_TEST(PathValidatorTest,
for (size_t i = 0; i < 3; ++i) {
auto neighbors = this->expandPath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
s = neighbors.at(0);
auto res = validator.validatePath(s);
EXPECT_FALSE(res.isFiltered());
Expand Down Expand Up @@ -276,7 +276,7 @@ TYPED_TEST(PathValidatorTest,
for (size_t i = 0; i < 3; ++i) {
auto neighbors = this->expandPath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
s = neighbors.at(0);
auto res = validator.validatePath(s);
EXPECT_FALSE(res.isFiltered());
Expand Down Expand Up @@ -319,7 +319,7 @@ TYPED_TEST(PathValidatorTest,
for (size_t i = 0; i < 3; ++i) {
auto neighbors = this->expandPath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
s = neighbors.at(0);
auto res = validator.validatePath(s);
EXPECT_FALSE(res.isFiltered());
Expand Down Expand Up @@ -376,7 +376,7 @@ TYPED_TEST(PathValidatorTest,
for (size_t i = 0; i < 2; ++i) {
auto neighbors = this->expandPath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
s = neighbors.at(0);
auto res = validator.validatePath(s);
EXPECT_FALSE(res.isFiltered());
Expand All @@ -395,7 +395,7 @@ TYPED_TEST(PathValidatorTest,
for (size_t i = 0; i < 1; ++i) {
auto neighbors = this->expandPath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
s = neighbors.at(0);
auto res = validator.validatePath(s);
EXPECT_FALSE(res.isFiltered());
Expand Down Expand Up @@ -457,7 +457,7 @@ TYPED_TEST(PathValidatorTest,
for (size_t i = 0; i < 2; ++i) {
auto neighbors = this->expandPath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
s = neighbors.at(0);
auto res = validator.validatePath(s);
EXPECT_FALSE(res.isFiltered());
Expand All @@ -476,7 +476,7 @@ TYPED_TEST(PathValidatorTest,
for (size_t i = 0; i < 1; ++i) {
auto neighbors = this->expandPath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
s = neighbors.at(0);
auto res = validator.validatePath(s);
EXPECT_FALSE(res.isFiltered());
Expand Down Expand Up @@ -527,7 +527,7 @@ TYPED_TEST(PathValidatorTest,
for (size_t i = 0; i < 2; ++i) {
auto neighbors = this->expandPath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
s = neighbors.at(0); // s == 1, s == 2
auto res = validator.validatePath(s);
EXPECT_FALSE(res.isFiltered());
Expand All @@ -538,7 +538,7 @@ TYPED_TEST(PathValidatorTest,
// depends only on VertexUniqueness, the edge (2,1) is new
auto neighbors = this->expandPath(s); // {1}
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
s = neighbors.at(0); // s == 1 (second time)
auto res = validator.validatePath(s);
if (this->getVertexUniqueness() == VertexUniquenessLevel::PATH ||
Expand All @@ -552,7 +552,7 @@ TYPED_TEST(PathValidatorTest,
neighbors = this->expandPath(s); // {2} (second time)
s = neighbors.at(0); // 2
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
res = validator.validatePath(s);
if (this->getEdgeUniqueness() == EdgeUniquenessLevel::NONE) {
EXPECT_FALSE(res.isFiltered());
Expand Down Expand Up @@ -603,7 +603,7 @@ TYPED_TEST(PathValidatorTest,
for (size_t i = 0; i < 2; ++i) { // vertices 2 and 3
auto neighbors = this->expandPath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
s = neighbors.at(0);
auto res = validator.validatePath(s);
EXPECT_FALSE(res.isFiltered());
Expand All @@ -623,7 +623,7 @@ TYPED_TEST(PathValidatorTest,
auto neighbors = this->expandPath(s); // {2}
res = validator.validatePath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
if (this->getVertexUniqueness() == VertexUniquenessLevel::GLOBAL) {
EXPECT_TRUE(res.isFiltered());
EXPECT_TRUE(res.isPruned());
Expand All @@ -633,7 +633,7 @@ TYPED_TEST(PathValidatorTest,
// extend to vertex 3
neighbors = this->expandPath(s);
ASSERT_EQ(neighbors.size(), 1U)
<< "Not enough connections after step " << s.getVertexIdentifier();
<< "Not enough connections after step " << s.getVertex().getID();
res = validator.validatePath(s);
if (this->getEdgeUniqueness() == EdgeUniquenessLevel::NONE ||
this->getEdgeUniqueness() == EdgeUniquenessLevel::PATH) {
Expand Down
13 changes: 0 additions & 13 deletions tests/Mocks/MockGraphProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,19 +232,6 @@ class MockGraphProvider {
return _edge;
}

VertexType getVertexIdentifier() const { return getVertex().getID(); }
arangodb::velocypack::HashedStringRef getEdgeIdentifier() const {
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());
Expand Down