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

Draft
markuspf wants to merge 9 commits into
base: devel
Choose a base branch
from
Draft

[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
Use type alias and remove unused function
  • Loading branch information
@markuspf
markuspf committed Nov 28, 2025
commit 9a74fbf584d598038756e821a0e9d8a1351572fa
4 changes: 2 additions & 2 deletions arangod/Graph/Providers/SingleServerProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,13 @@ auto SingleServerProvider<Step>::clear() -> void {

template<class Step>
void SingleServerProvider<Step>::insertEdgeIntoResult(
EdgeDocumentToken edge, arangodb::velocypack::Builder& builder) {
typename Step::EdgeType edge, arangodb::velocypack::Builder& builder) {
_edgeLookup.insertEdgeIntoResult(edge, builder);
}

template<class Step>
void SingleServerProvider<Step>::insertEdgeIdIntoResult(
EdgeDocumentToken edge, arangodb::velocypack::Builder& builder) {
typename Step::EdgeType edge, arangodb::velocypack::Builder& builder) {
_edgeLookup.insertEdgeIdIntoResult(edge, builder);
}

Expand Down
4 changes: 2 additions & 2 deletions arangod/Graph/Providers/SingleServerProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ class SingleServerProvider {
std::function<void(Step)> const& callback) -> void; // index
auto clear() -> void;

void insertEdgeIntoResult(EdgeDocumentToken edge,
void insertEdgeIntoResult(typename Step::EdgeType edge,
arangodb::velocypack::Builder& builder);
void insertEdgeIdIntoResult(EdgeDocumentToken edge,
void insertEdgeIdIntoResult(typename Step::EdgeType edge,
arangodb::velocypack::Builder& builder);

std::string getEdgeId(typename Step::Edge const& edge);
Expand Down
16 changes: 3 additions & 13 deletions arangod/Graph/Steps/SingleServerProviderStep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,11 @@ SingleServerProviderStep::SingleServerProviderStep(VertexType v, size_t depth,
_vertex(v),
_edge() {}

SingleServerProviderStep::SingleServerProviderStep(VertexType v,
EdgeDocumentToken edge,
SingleServerProviderStep::SingleServerProviderStep(VertexType v, EdgeType edge,
size_t prev)
: BaseStep(prev), _vertex(v), _edge(std::move(edge)) {}

SingleServerProviderStep::SingleServerProviderStep(VertexType v,
EdgeDocumentToken edge,
SingleServerProviderStep::SingleServerProviderStep(VertexType v, EdgeType edge,
size_t prev, size_t depth,
double weight)
: BaseStep(prev, depth, weight), _vertex(v), _edge(std::move(edge)) {}
Expand All @@ -70,12 +68,4 @@ SingleServerProviderStep::Edge::getID() const noexcept {
return _token;
}

bool SingleServerProviderStep::Edge::isValid() const noexcept {
return getID().isValid();
}

void SingleServerProviderStep::Edge::addToBuilder(
SingleServerProvider<SingleServerProviderStep>& provider,
arangodb::velocypack::Builder& builder) const {
provider.insertEdgeIntoResult(getID(), builder);
}
bool SingleServerProviderStep::Edge::isValid() const noexcept { return true; }
22 changes: 10 additions & 12 deletions arangod/Graph/Steps/SingleServerProviderStep.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@
/// @author Heiko Kernbach
////////////////////////////////////////////////////////////////////////////////

#include "Transaction/Methods.h"
#include <velocypack/HashedStringRef.h>
#include "Graph/EdgeDocumentToken.h"
#include "Transaction/Methods.h"
#include "Graph/Providers/BaseStep.h"
#include "Graph/Providers/TypeAliases.h"
#include "Graph/EdgeDocumentToken.h"

#pragma once

namespace arangodb {
namespace graph {
namespace arangodb::graph {

template<class EdgeType>
class SingleServerProvider;
Expand Down Expand Up @@ -61,21 +62,19 @@ class SingleServerProviderStep : public arangodb::graph::BaseStep {

class Edge {
public:
explicit Edge(EdgeDocumentToken tkn) noexcept : _token(std::move(tkn)) {}
explicit Edge(EdgeType tkn) noexcept : _token(std::move(tkn)) {}
Edge() noexcept : _token() {}

void addToBuilder(SingleServerProvider<SingleServerProviderStep>& provider,
arangodb::velocypack::Builder& builder) const;
EdgeType const& getID() const noexcept;
bool isValid() const noexcept;

private:
EdgeDocumentToken _token;
EdgeType _token;
};

SingleServerProviderStep(VertexType v);
SingleServerProviderStep(VertexType v, EdgeDocumentToken edge, size_t prev);
SingleServerProviderStep(VertexType v, EdgeDocumentToken edge, size_t prev,
SingleServerProviderStep(VertexType v, EdgeType edge, size_t prev);
SingleServerProviderStep(VertexType v, EdgeType edge, size_t prev,
size_t depth, double weight);
SingleServerProviderStep(VertexType v, size_t depth, double weight = 0.0);
~SingleServerProviderStep();
Expand All @@ -89,7 +88,7 @@ class SingleServerProviderStep : public arangodb::graph::BaseStep {

std::string toString() const {
return "<Step><Vertex>: " + _vertex.getID().toString() +
", <Edge>: " + std::to_string(_edge.getID().localDocumentId().id());
", <Edge>: " + _edge.getID().toString();
}
bool isProcessable() const { return !isLooseEnd(); }
bool isLooseEnd() const { return false; }
Expand Down Expand Up @@ -125,5 +124,4 @@ class SingleServerProviderStep : public arangodb::graph::BaseStep {
Vertex _vertex;
Edge _edge;
};
} // namespace graph
} // namespace arangodb
} // namespace arangodb::graph