Skip to content

ARROW-12939: [R] Simplify RTask stop handling #10444

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
romainfrancois wants to merge 1 commit into from
Closed

ARROW-12939: [R] Simplify RTask stop handling #10444

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
33 changes: 6 additions & 27 deletions r/src/r_to_arrow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ class RTasks {
// run the delayed tasks now
for (auto& task : delayed_serial_tasks_) {
status &= std::move(task)();
if (!status.ok()) {
stop_source_.RequestStop();
break;
}
}

// then wait for the parallel tasks to finish
Expand All @@ -86,11 +90,10 @@ class RTasks {
}

void Append(bool parallel, Task&& task) {
StoppingTask stopping_task(stop_source_, std::move(task));
if (parallel && use_threads_) {
parallel_tasks_->Append(std::move(stopping_task));
parallel_tasks_->Append(std::move(task));
} else {
delayed_serial_tasks_.push_back(std::move(stopping_task));
delayed_serial_tasks_.push_back(std::move(task));
}
}

Expand All @@ -108,30 +111,6 @@ class RTasks {
StopSource stop_source_;
std::shared_ptr<arrow::internal::TaskGroup> parallel_tasks_;
std::vector<Task> delayed_serial_tasks_;

private:
class StoppingTask {
public:
StoppingTask(StopSource stop_source, Task&& task) : task_(std::move(task)) {}

Status operator()() {
Status status;
StopToken token = stop_source_.token();
if (token.IsStopRequested()) {
status &= token.Poll();
} else {
Status status = std::move(task_)();
if (!status.ok()) {
stop_source_.RequestStop();
}
}
return status;
}

private:
StopSource stop_source_;
Task task_;
};
};

struct RConversionOptions {
Expand Down