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

GH-35838: [C++] Fix asof join backpresure #35878

Merged
merged 3 commits into from
Jun 1, 2023
Merged

GH-35838: [C++] Fix asof join backpresure #35878

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
108af70
GH-35838: Fix asof join backpresure
icexelloss Jun 1, 2023
c38ab41
Revert changes to BackpressureController due to forward declaration i…
icexelloss Jun 1, 2023
7a7bee0
Fix bug
icexelloss Jun 1, 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
6 changes: 3 additions & 3 deletions cpp/src/arrow/acero/asof_join_node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ class InputState {

static Result<std::unique_ptr<InputState>> Make(
size_t index, TolType tolerance, bool must_hash, bool may_rehash,
KeyHasher* key_hasher, AsofJoinNode* node, ExecNode* output,
KeyHasher* key_hasher, ExecNode* node, AsofJoinNode* output,
std::atomic<int32_t>& backpressure_counter,
const std::shared_ptr<arrow::Schema>& schema, const col_index_t time_col_index,
const std::vector<col_index_t>& key_col_index) {
Expand All @@ -679,7 +679,7 @@ class InputState {
BackpressureHandler::Make(low_threshold, high_threshold,
std::move(backpressure_control)));
return std::make_unique<InputState>(index, tolerance, must_hash, may_rehash,
key_hasher, node, std::move(handler), schema,
key_hasher, output, std::move(handler), schema,
time_col_index, key_col_index);
}

Expand Down Expand Up @@ -1407,7 +1407,7 @@ class AsofJoinNode : public ExecNode {
ARROW_ASSIGN_OR_RAISE(
auto input_state,
InputState::Make(i, tolerance_, must_hash_, may_rehash_, key_hashers_[i].get(),
this, inputs[i], backpressure_counter_,
inputs[i], this, backpressure_counter_,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simply reverting this line where the bug is introduced:
https://github.com/apache/arrow/pull/34392/files#diff-5493b6ae7ea2a4d5cfb581034c076e9c4be7608382168de6d1301ef67b6c01eeR1410

@rtpsw is working on adding tests but it could take some time.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that I have just added tests in #35874, though this PR can proceed, if so desired.

inputs[i]->output_schema(), indices_of_on_key_[i],
indices_of_by_key_[i]));
state_.push_back(std::move(input_state));
Expand Down