Skip to content

branch-4.1: [refactor](be) Remove scanner eos flag #63578#63731

Merged
yiguolei merged 1 commit into
branch-4.1from
auto-pick-63578-branch-4.1
May 28, 2026
Merged

branch-4.1: [refactor](be) Remove scanner eos flag #63578#63731
yiguolei merged 1 commit into
branch-4.1from
auto-pick-63578-branch-4.1

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Cherry-picked from #63578

### What changed

Remove the extra `_alreay_eos` scanner state from the scan projection
path.

When `get_block()` reports eos while both `_padding_block` and the final
`_origin_block` contain data, the projection path now merges them
directly and returns `eos=true` in the same call. This can make only the
final output block larger than the normal batch target, but each source
block is already bounded by the lower scanner.

### Why

`_alreay_eos` only existed to carry the final eos handoff across calls,
and it also carried a typo in the member name. Merging the final
padding/origin blocks at eos removes that extra state and keeps the
block lifecycle simpler without changing query results.

### Validation

- Formatted modified C++ files with `build-support/run_clang_format.py`
using clang-format 16.
- `git diff --check`
- `ninja -C be/ut_build_ASAN -j 1
src/exec/CMakeFiles/Exec.dir/scan/scanner.cpp.o
test/CMakeFiles/doris_be_test.dir/exec/scan/scanner_late_arrival_rf_test.cpp.o`
- Attempted `./run-be-ut.sh --run -j 1
--filter=ScannerProjectionTest.merges_padding_block_when_limit_eos_without_extra_flag:ScannerLateArrivalRfTest.applied_rf_num_advances_after_late_arrival`;
the full BE UT target did not complete locally because it started a
broad rebuild on the shared host and process-resource pressure was
observed (`fork: Resource temporarily unavailable`).

### Release note

None
@github-actions github-actions Bot requested a review from yiguolei as a code owner May 27, 2026 07:58
@hello-stephen
Copy link
Copy Markdown
Contributor

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@hello-stephen
Copy link
Copy Markdown
Contributor

run buildall

@hello-stephen
Copy link
Copy Markdown
Contributor

BE Regression && UT Coverage Report

Increment line coverage 95.45% (21/22) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 73.50% (27121/36897)
Line Coverage 57.06% (292907/513323)
Region Coverage 54.48% (244886/449458)
Branch Coverage 56.16% (106402/189466)

@yiguolei yiguolei merged commit 8a6c5d8 into branch-4.1 May 28, 2026
29 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants