-
Notifications
You must be signed in to change notification settings - Fork 3.7k
GH-46224: [C++][Acero] Fix the hang in asof join #46300
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.
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
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b4b0cf8
Draft the fix
zanmato1984 d1e11ae
Fix build
zanmato1984 f1397a1
Delete cpp/src/arrow/compute/row/doc/row_table.md
zanmato1984 4b9db70
Remove hack for reproduction
zanmato1984 ecf58a0
Remove hack for reproduction
zanmato1984 af70071
Describe the test
zanmato1984 3a273b3
Update cpp/src/arrow/acero/asof_join_node.cc
zanmato1984 dd7a66b
Update test according to the review comment
zanmato1984 5f5b895
Reduce test iteration for sanitizier and valgrind
zanmato1984 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMO this code is apparently NOT doing what it is supposed to do: by here the
have_active_batch
must betrue
, meaningqueue_
must be non-empty. Then popping the queue always gets a validstd::optional
and effectively settinghave_active_batch
to false. Theif
branch below won't be executed.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I noticed there are two fixes made before in the following
if
branch #36094 and #36499. Given that thishave_active_batch &= !queue_.TryPop()
exists since #13028 where it was introduced, and the lack of corresponding tests, I'm not sure how they fixed anything and what the bugs even were. So I just remove them.