Skip to content

ARROW-18240: [R] head() is crashing on some nightly builds #14582

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

Merged
paleolimbot merged 3 commits into from
Jan 2, 2023
Merged

ARROW-18240: [R] head() is crashing on some nightly builds #14582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8219cb
don't delete source reader
paleolimbot Nov 3, 2022
cb2031d
use the IO thread pool for a RecordBatchReader input to an ExecPlan
paleolimbot Dec 16, 2022
854b156
reference issue
paleolimbot Jan 2, 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
11 changes: 10 additions & 1 deletion r/src/compute-exec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@
#include <iostream>
#include <optional>

// GH-15151: Best path forward to make this available without a hack like this one
namespace arrow {
namespace io {
namespace internal {
arrow::internal::ThreadPool* GetIOThreadPool();
}
} // namespace io
} // namespace arrow

namespace compute = ::arrow::compute;

std::shared_ptr<compute::FunctionOptions> make_compute_options(std::string func_name,
Expand Down Expand Up @@ -447,7 +456,7 @@ std::shared_ptr<compute::ExecNode> ExecNode_SourceNode(
arrow::compute::SourceNodeOptions options{
/*output_schema=*/reader->schema(),
/*generator=*/ValueOrStop(
compute::MakeReaderGenerator(reader, arrow::internal::GetCpuThreadPool()))};
compute::MakeReaderGenerator(reader, arrow::io::internal::GetIOThreadPool()))};

return MakeExecNodeOrStop("source", plan.get(), {}, options);
}
Expand Down
13 changes: 7 additions & 6 deletions r/src/recordbatchreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ class RecordBatchReaderHead : public arrow::RecordBatchReader {
public:
RecordBatchReaderHead(std::shared_ptr<arrow::RecordBatchReader> reader,
int64_t num_rows)
: schema_(reader->schema()), reader_(reader), num_rows_(num_rows) {}
: done_(false), schema_(reader->schema()), reader_(reader), num_rows_(num_rows) {}

std::shared_ptr<arrow::Schema> schema() const override { return schema_; }

arrow::Status ReadNext(std::shared_ptr<arrow::RecordBatch>* batch_out) override {
if (!reader_) {
if (done_) {
// Close() has been called
batch_out = nullptr;
return arrow::Status::OK();
Expand Down Expand Up @@ -161,16 +161,17 @@ class RecordBatchReaderHead : public arrow::RecordBatchReader {
}

arrow::Status Close() override {
if (reader_) {
if (done_) {
return arrow::Status::OK();
} else {
done_ = true;
arrow::Status result = reader_->Close();
reader_.reset();
return result;
} else {
return arrow::Status::OK();
}
}

private:
bool done_;
std::shared_ptr<arrow::Schema> schema_;
std::shared_ptr<arrow::RecordBatchReader> reader_;
int64_t num_rows_;
Expand Down