Skip to content
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

Jump to bottom

push step limit down storage #5880

Merged
merged 1 commit into from
May 11, 2024
Merged

push step limit down storage #5880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions src/graph/executor/query/ExpandAllExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ folly::Future<Status> ExpandAllExecutor::getNeighbors() {
std::vector<Value> vids(nextStepVids_.size());
std::move(nextStepVids_.begin(), nextStepVids_.end(), vids.begin());
QueryExpressionContext qec(qctx()->ectx());
auto stepLimit =
stepLimits_.empty() ? std::numeric_limits<int64_t>::max() : stepLimits_[currentStep_ - 2];
auto limit = std::min(stepLimit, expand_->limit(qec));
return storageClient
->getNeighbors(param,
{nebula::kVid},
Expand All @@ -153,9 +156,9 @@ folly::Future<Status> ExpandAllExecutor::getNeighbors() {
expand_->edgeProps(),
nullptr,
false,
false,
sample_,
std::vector<storage::cpp2::OrderBy>(),
expand_->limit(qec),
limit,
expand_->filter(),
nullptr)
.via(runner())
Expand Down Expand Up @@ -402,6 +405,12 @@ folly::Future<Status> ExpandAllExecutor::handleResponse(RpcResponse&& resps) {
buildResult(curVertexProps, edgeProps);
}

if (!stepLimits_.empty()) {
// if stepLimits_ is not empty, do not use cache
nextStepVids_.emplace(dst);
continue;
}

if (adjList_.find(dst) == adjList_.end()) {
nextStepVids_.emplace(dst);
} else {
Expand All @@ -413,7 +422,9 @@ folly::Future<Status> ExpandAllExecutor::handleResponse(RpcResponse&& resps) {
adjList_.emplace(curVid, std::move(adjEdgeProps));
}

resetNextStepVids(visitedVids);
if (stepLimits_.empty()) {
resetNextStepVids(visitedVids);
}

if (!preVisitedVids_.empty()) {
getNeighborsFromCache(dst2VidsMap, visitedVids, samples);
Expand Down
11 changes: 9 additions & 2 deletions src/graph/executor/query/ExpandExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ folly::Future<Status> ExpandExecutor::getNeighbors() {
qctx_->plan()->isProfileEnabled());
std::vector<Value> vids(nextStepVids_.size());
std::move(nextStepVids_.begin(), nextStepVids_.end(), vids.begin());
auto stepLimit =
stepLimits_.empty() ? std::numeric_limits<int64_t>::max() : stepLimits_[currentStep_ - 1];
return storageClient
->getNeighbors(param,
{nebula::kVid},
Expand All @@ -152,9 +154,9 @@ folly::Future<Status> ExpandExecutor::getNeighbors() {
expand_->edgeProps(),
nullptr,
false,
false,
sample_,
std::vector<storage::cpp2::OrderBy>(),
-1,
stepLimit,
nullptr,
nullptr)
.via(runner())
Expand Down Expand Up @@ -323,6 +325,11 @@ folly::Future<Status> ExpandExecutor::handleResponse(RpcResponse&& resps) {
if (currentStep_ >= maxSteps_) {
continue;
}
if (!stepLimits_.empty()) {
// do not use cache when stepLimits_ is not empty
nextStepVids_.emplace(dst);
continue;
}
if (adjDsts_.find(dst) == adjDsts_.end()) {
nextStepVids_.emplace(dst);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/planner/plan/Query.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ class ExpandAll : public Expand {
} else if (edgeColumns_) {
colNames = edgeColumns_->names();
}
setLimit(-1);
setLimit(std::numeric_limits<int64_t>::max());
setColNames(colNames);
}

Expand Down
1 change: 0 additions & 1 deletion tests/tck/features/go/SampleLimit.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ Feature: Sample and limit
| like._dst |
| /[\s\w+]/ |
| /[\s\w+]/ |
| /[\s\w+]/ |
1 change: 0 additions & 1 deletion tests/tck/features/go/SampleLimit.intVid.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ Feature: Sample and limit
| like._dst |
| /[\d\-+]/ |
| /[\d\-+]/ |
| /[\d\-+]/ |
2 changes: 0 additions & 2 deletions tests/tck/features/optimizer/PushSampleDownRule.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Feature: Push Limit down rule
Then the result should be, in any order:
| like._dst |
| /[\w\s]+/ |
| /[\w\s]+/ |
And the execution plan should be:
| id | name | dependencies | operator info |
| 4 | Project | 3 | |
Expand All @@ -42,7 +41,6 @@ Feature: Push Limit down rule
Then the result should be, in any order:
| src | likeness | dst |
| /[\w\s]+/ | /\d\d/ | /[\w\s]+/ |
| /[\w\s]+/ | /\d\d/ | /[\w\s]+/ |
And the execution plan should be:
| id | name | dependencies | profiling data | operator info |
| 8 | Project | 7 | | |
Expand Down
Loading