branch-4.0: [fix](be) Pick #63969 and #63136#64116
Open
BiteTheDDDDt wants to merge 3 commits into
Open
Conversation
### What problem does this PR solve?
Issue Number: None
Related PR: None
Problem Summary: TopN runtime filters record their source node ids on the target scan node thrift, but the coordinator only marked OlapScan-related source SortNodes as runtime-predicate sources before serializing the plan. For non-Olap scans such as external file scans, the source SortNode could keep a non-runtime-predicate sort algorithm for larger limits, so BE received the ids but filtered them out because the runtime predicate source was never detected. This change marks every scan node's TopN filter source SortNode consistently in both coordinator thrift paths.
### Release note
Fix TopN runtime filter activation for non-Olap scan targets.
### Check List (For Author)
- Test: Unit Test
- ./run-fe-ut.sh --run org.apache.doris.qe.runtime.ThriftPlansBuilderTest,org.apache.doris.qe.CoordinatorTest#testTopnFilterDescsSharedAmongInstances
- ./build.sh --fe
- Behavior changed: Yes. TopN runtime filters on non-Olap scan targets now activate consistently with their serialized source node ids.
- Does this need documentation: No
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
(cherry picked from commit d99156a)
Issue Number: N/A Related PR: apache#59088 Problem Summary: apache#59088 changed TopN runtime predicate target initialization to rely on a storage column id. For targets that cannot create a storage column predicate, such as non-pushdown TopN predicates or unsupported storage columns, init_target returned before marking the target as detected. That left RuntimePredicate disabled, so the scan side ignored the TopN source even though FE had sent the source id. This change keeps the target detected when no storage predicate is created, removes obsolete compatibility skips for missing runtime predicate descs, and adds FE/BE coverage for the source marking and no-column target paths. None - Test: Unit Test - ./run-fe-ut.sh --run org.apache.doris.qe.runtime.ThriftPlansBuilderTest,org.apache.doris.qe.CoordinatorTest - ./run-be-ut.sh --run --filter=RuntimePredicateTest.* - cd fe && mvn checkstyle:check -pl fe-core -q - build-support/check-format.sh - Behavior changed: No - Does this need documentation: No Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 38a8f54)
### What problem does this PR solve?
Issue Number: None
Related PR: None
Problem Summary: Arrow Flight SQL queries that return results from BE do not create local result receivers. The old coordinator still initialized ResultReceiverConsumer with an empty receiver list, which failed with ArrayBlockingQueue(0), and the new coordinator still created unnecessary local receivers for remote result mode.
### Release note
Fix Arrow Flight SQL query execution when results are returned from BE.
### Check List (For Author)
- Test: Unit Test
- Ran org.apache.doris.qe.ResultReceiverConsumerTest
- Ran FE checkstyle for fe-core
- Behavior changed: No
- Does this need documentation: No
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
(cherry picked from commit 177eaac)
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
run buildall |
Contributor
BE UT Coverage ReportIncrement line coverage Increment coverage report
|
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
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.
Summary
ACCESS_STRING_OFFSET,only_read_offsets; prerequisites such as [Exec](be) Support offset prue column and null column in BE #61888/[opt](nereids) optimize length(str_col) by only read offset sub column #62205 are not on branch-4.0/4.1). Direct conflict resolution would effectively backport a larger optimization stack.Testing
build-support/check-format.sh./run-be-ut.sh --run --filter=RuntimePredicateTest.*./run-fe-ut.sh --run org.apache.doris.qe.runtime.ThriftPlansBuilderTest,org.apache.doris.qe.OldCoordinatorTest,org.apache.doris.qe.ResultReceiverConsumerTest