Skip to content

ARROW-15297: [C++] The write node options shouldn't require a schema [WIP] #12310

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

ARROW-15297: [C++] The write node options shouldn't require a schema [WIP] #12310

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
2 changes: 1 addition & 1 deletion cpp/examples/arrow/execution_plan_documentation_examples.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ arrow::Status ScanFilterWriteExample(cp::ExecContext& exec_context,
write_options.partitioning = partitioning;
write_options.basename_template = "part{i}.parquet";

arrow::dataset::WriteNodeOptions write_node_options{write_options, dataset->schema()};
arrow::dataset::WriteNodeOptions write_node_options{write_options};

ARROW_RETURN_NOT_OK(cp::MakeExecNode("write", plan.get(), {scan}, write_node_options));

Expand Down
7 changes: 3 additions & 4 deletions cpp/src/arrow/dataset/file_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,7 @@ Status FileSystemDataset::Write(const FileSystemDatasetWriteOptions& write_optio
{"filter", compute::FilterNodeOptions{scanner->options()->filter}},
{"project",
compute::ProjectNodeOptions{std::move(exprs), std::move(names)}},
{"write",
WriteNodeOptions{write_options, scanner->options()->projected_schema,
backpressure_toggle}},
{"write", WriteNodeOptions{write_options, backpressure_toggle}},
})
.AddToPlan(plan.get()));

Expand All @@ -380,7 +378,8 @@ Result<compute::ExecNode*> MakeWriteNode(compute::ExecPlan* plan,
const WriteNodeOptions write_node_options =
checked_cast<const WriteNodeOptions&>(options);
const FileSystemDatasetWriteOptions& write_options = write_node_options.write_options;
const std::shared_ptr<Schema>& schema = write_node_options.schema;
// write schema should be the output schema of the input to the write node.
const std::shared_ptr<Schema>& schema = inputs[0]->output_schema();
const std::shared_ptr<util::AsyncToggle>& backpressure_toggle =
write_node_options.backpressure_toggle;

Expand Down
4 changes: 1 addition & 3 deletions cpp/src/arrow/dataset/file_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,14 +408,12 @@ struct ARROW_DS_EXPORT FileSystemDatasetWriteOptions {
class ARROW_DS_EXPORT WriteNodeOptions : public compute::ExecNodeOptions {
public:
explicit WriteNodeOptions(
FileSystemDatasetWriteOptions options, std::shared_ptr<Schema> schema,
FileSystemDatasetWriteOptions options,
std::shared_ptr<util::AsyncToggle> backpressure_toggle = NULLPTR)
: write_options(std::move(options)),
schema(std::move(schema)),
backpressure_toggle(std::move(backpressure_toggle)) {}

FileSystemDatasetWriteOptions write_options;
std::shared_ptr<Schema> schema;
std::shared_ptr<util::AsyncToggle> backpressure_toggle;
};

Expand Down