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

change collect to collectAll #5789

Merged
merged 2 commits into from
Dec 26, 2023
Merged

change collect to collectAll #5789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a62dfb6
change collect to collectAll
nevermore3 Dec 24, 2023
c482665
fix compiler error
nevermore3 Dec 25, 2023
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
52 changes: 36 additions & 16 deletions src/graph/executor/algo/AllPathsExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,29 @@ folly::Future<Status> AllPathsExecutor::doAllPaths() {
break;
}
}
return folly::collect(futures).via(runner()).thenValue([this](auto&& resps) {
memory::MemoryCheckGuard guard;
for (auto& resp : resps) {
if (!resp.ok()) {
return folly::makeFuture<Status>(std::move(resp));
}
}
if (leftSteps_ + rightSteps_ >= maxStep_ || leftNextStepVids_.empty() ||
rightNextStepVids_.empty()) {
return buildResult();
}
return doAllPaths();
});
return folly::collectAll(futures).via(runner()).thenValue(
[this](std::vector<folly::Try<Status>>&& resps) {
memory::MemoryCheckGuard guard;
for (auto& respVal : resps) {
if (respVal.hasException()) {
auto ex = respVal.exception().get_exception<std::bad_alloc>();
if (ex) {
throw std::bad_alloc();
} else {
throw std::runtime_error(respVal.exception().what().c_str());
}
}
auto resp = std::move(respVal).value();
if (!resp.ok()) {
return folly::makeFuture<Status>(std::move(resp));
}
}
if (leftSteps_ + rightSteps_ >= maxStep_ || leftNextStepVids_.empty() ||
rightNextStepVids_.empty()) {
return buildResult();
}
return doAllPaths();
});
}

folly::Future<Status> AllPathsExecutor::getNeighbors(bool reverse) {
Expand Down Expand Up @@ -545,12 +555,22 @@ folly::Future<Status> AllPathsExecutor::conjunctPath(std::vector<NPath*>& leftPa
runner(), [this, start, end, reverse]() { return probe(start, end, reverse); }));
}
}
return folly::collect(futures)
return folly::collectAll(futures)
.via(runner())
.thenValue([this, path = std::move(oneWayPath)](std::vector<std::vector<Row>>&& resps) {
.thenValue([this,
path = std::move(oneWayPath)](std::vector<folly::Try<std::vector<Row>>>&& resps) {
memory::MemoryCheckGuard guard;
result_.rows = std::move(path);
for (auto& rows : resps) {
for (auto& respVal : resps) {
if (respVal.hasException()) {
auto ex = respVal.exception().get_exception<std::bad_alloc>();
if (ex) {
throw std::bad_alloc();
} else {
throw std::runtime_error(respVal.exception().what().c_str());
}
}
auto rows = std::move(respVal).value();
if (rows.empty()) {
continue;
}
Expand Down
49 changes: 34 additions & 15 deletions src/graph/executor/algo/BatchShortestPath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,28 @@ folly::Future<Status> BatchShortestPath::execute(const HashSet& startVids,
resultDs_[rowNum].colNames = pathNode_->colNames();
futures.emplace_back(shortestPath(rowNum, 1));
}
return folly::collect(futures).via(runner()).thenValue([this, result](auto&& resps) {
// MemoryTrackerVerified
memory::MemoryCheckGuard guard;
for (auto& resp : resps) {
NG_RETURN_IF_ERROR(resp);
}
result->colNames = pathNode_->colNames();
for (auto& ds : resultDs_) {
result->append(std::move(ds));
}
return Status::OK();
});
return folly::collectAll(futures).via(runner()).thenValue(
[this, result](std::vector<folly::Try<Status>>&& resps) {
// MemoryTrackerVerified
memory::MemoryCheckGuard guard;
for (auto& respVal : resps) {
if (respVal.hasException()) {
auto ex = respVal.exception().get_exception<std::bad_alloc>();
if (ex) {
throw std::bad_alloc();
} else {
throw std::runtime_error(respVal.exception().what().c_str());
}
}
auto resp = std::move(respVal).value();
NG_RETURN_IF_ERROR(resp);
}
result->colNames = pathNode_->colNames();
for (auto& ds : resultDs_) {
result->append(std::move(ds));
}
return Status::OK();
});
}

size_t BatchShortestPath::init(const HashSet& startVids, const HashSet& endVids) {
Expand Down Expand Up @@ -100,12 +110,21 @@ folly::Future<Status> BatchShortestPath::shortestPath(size_t rowNum, size_t step
std::vector<folly::Future<Status>> futures;
futures.emplace_back(getNeighbors(rowNum, stepNum, false));
futures.emplace_back(getNeighbors(rowNum, stepNum, true));
return folly::collect(futures)
return folly::collectAll(futures)
.via(runner())
.thenValue([this, rowNum, stepNum](auto&& resps) {
.thenValue([this, rowNum, stepNum](std::vector<folly::Try<Status>>&& resps) {
// MemoryTrackerVerified
memory::MemoryCheckGuard guard;
for (auto& resp : resps) {
for (auto& respVal : resps) {
if (respVal.hasException()) {
auto ex = respVal.exception().get_exception<std::bad_alloc>();
if (ex) {
throw std::bad_alloc();
} else {
throw std::runtime_error(respVal.exception().what().c_str());
}
}
auto resp = std::move(respVal).value();
if (!resp.ok()) {
return folly::makeFuture<Status>(std::move(resp));
}
Expand Down
47 changes: 33 additions & 14 deletions src/graph/executor/algo/SingleShortestPath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,27 @@ folly::Future<Status> SingleShortestPath::execute(const HashSet& startVids,
resultDs_[rowNum].colNames = pathNode_->colNames();
futures.emplace_back(shortestPath(rowNum, 1));
}
return folly::collect(futures).via(runner()).thenValue([this, result](auto&& resps) {
memory::MemoryCheckGuard guard;
for (auto& resp : resps) {
NG_RETURN_IF_ERROR(resp);
}
result->colNames = pathNode_->colNames();
for (auto& ds : resultDs_) {
result->append(std::move(ds));
}
return Status::OK();
});
return folly::collectAll(futures).via(runner()).thenValue(
[this, result](std::vector<folly::Try<Status>>&& resps) {
memory::MemoryCheckGuard guard;
for (auto& respVal : resps) {
if (respVal.hasException()) {
auto ex = respVal.exception().get_exception<std::bad_alloc>();
if (ex) {
throw std::bad_alloc();
} else {
throw std::runtime_error(respVal.exception().what().c_str());
}
}
auto resp = std::move(respVal).value();
NG_RETURN_IF_ERROR(resp);
}
result->colNames = pathNode_->colNames();
for (auto& ds : resultDs_) {
result->append(std::move(ds));
}
return Status::OK();
});
}

void SingleShortestPath::init(const HashSet& startVids, const HashSet& endVids, size_t rowSize) {
Expand Down Expand Up @@ -69,11 +79,20 @@ folly::Future<Status> SingleShortestPath::shortestPath(size_t rowNum, size_t ste
futures.reserve(2);
futures.emplace_back(getNeighbors(rowNum, stepNum, false));
futures.emplace_back(getNeighbors(rowNum, stepNum, true));
return folly::collect(futures)
return folly::collectAll(futures)
.via(runner())
.thenValue([this, rowNum, stepNum](auto&& resps) {
.thenValue([this, rowNum, stepNum](std::vector<folly::Try<Status>>&& resps) {
memory::MemoryCheckGuard guard;
for (auto& resp : resps) {
for (auto& respVal : resps) {
if (respVal.hasException()) {
auto ex = respVal.exception().get_exception<std::bad_alloc>();
if (ex) {
throw std::bad_alloc();
} else {
throw std::runtime_error(respVal.exception().what().c_str());
}
}
auto resp = std::move(respVal).value();
if (!resp.ok()) {
return folly::makeFuture<Status>(std::move(resp));
}
Expand Down