[Bug](sink) fix cancel_at_time not work at parallel_sink/parallel_outfile#61740
Merged
yiguolei merged 3 commits intoapache:branch-4.1from Mar 26, 2026
Merged
[Bug](sink) fix cancel_at_time not work at parallel_sink/parallel_outfile#61740yiguolei merged 3 commits intoapache:branch-4.1from
yiguolei merged 3 commits intoapache:branch-4.1from
Conversation
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
run buildall |
There was a problem hiding this comment.
Pull request overview
Fixes deferred result-buffer cancellation in BE sink operators by using the correct ResultBufferMgr key in parallel modes, so cancel_at_time() actually finds and removes the registered buffer entry (picked from #61739).
Changes:
- Update
ResultSinkLocalState::close()to callcancel_at_time()withquery_idwhenenable_parallel_result_sinkis enabled (otherwise usefragment_instance_id). - Update
ResultFileSinkLocalState::close()to callcancel_at_time()withquery_idwhenenable_parallel_outfileis enabled (otherwise usefragment_instance_id). - Add clarifying comments explaining the keying difference between parallel vs non-parallel modes.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| be/src/exec/operator/result_sink_operator.cpp | Aligns deferred cancellation key with parallel result-sink sender registration (query_id vs fragment_instance_id). |
| be/src/exec/operator/result_file_sink_operator.cpp | Aligns deferred cancellation key with parallel outfile sender registration (query_id vs fragment_instance_id). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
Author
|
run buildall |
Contributor
Author
|
run buildall |
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
yiguolei
approved these changes
Mar 26, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
pick #61739