This is an automated email from the ASF dual-hosted git repository. mrhhsg pushed a commit to branch adaptive_batch_size in repository https://gitbox.apache.org/repos/asf/doris.git
commit ad43a025dbf2704723f515742225d5fdaadf734f Author: Hu Shenggang <[email protected]> AuthorDate: Tue Apr 7 18:13:59 2026 +0800 [fix](be) Address remaining review comments for adaptive batch size ### What problem does this PR solve? Issue Number: close #xxx Related PR: #xxx Problem Summary: Follow-up fixes for remaining review comments on PR #61535: 1. Removed stale commented-out DROP TABLE in regression test 2. Reset all modified session variables (batch_size, preferred_block_size_rows) in regression test cleanup to prevent leaking into subsequent suites 3. Renamed misleading test "BaseTabletReaderReturnsZero" to "VirtualDispatchThroughTabletReaderPtr" with accurate comment 4. Applied clang-format to beta_rowset_reader.cpp ### Release note None ### Check List (For Author) - Test: Unit Test (BlockReaderBatchMaxRows, BlockReaderByteBudget, EstimateCollectedEnough — 27 tests passed) - Behavior changed: No - Does this need documentation: No Co-authored-by: Copilot <[email protected]> --- be/src/storage/rowset/beta_rowset_reader.cpp | 3 +-- .../storage/iterator/vcollect_iterator_collected_enough_test.cpp | 5 ++--- .../suites/query_p0/adaptive_batch_size/adaptive_batch_size.groovy | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/be/src/storage/rowset/beta_rowset_reader.cpp b/be/src/storage/rowset/beta_rowset_reader.cpp index 8d147c52a1c..494ddeb5230 100644 --- a/be/src/storage/rowset/beta_rowset_reader.cpp +++ b/be/src/storage/rowset/beta_rowset_reader.cpp @@ -101,8 +101,7 @@ Status BetaRowsetReader::get_segment_iterators(RowsetReaderContext* read_context // preferred_block_size_rows so the predictor can grow beyond the legacy batch_size. if (config::enable_adaptive_batch_size && read_context->preferred_block_size_bytes > 0 && read_context->preferred_block_size_rows > 0) { - _read_options.block_row_max = - cast_set<uint32_t>(read_context->preferred_block_size_rows); + _read_options.block_row_max = cast_set<uint32_t>(read_context->preferred_block_size_rows); } else { _read_options.block_row_max = read_context->batch_size; } diff --git a/be/test/storage/iterator/vcollect_iterator_collected_enough_test.cpp b/be/test/storage/iterator/vcollect_iterator_collected_enough_test.cpp index 62655d3c52b..6ad845a806c 100644 --- a/be/test/storage/iterator/vcollect_iterator_collected_enough_test.cpp +++ b/be/test/storage/iterator/vcollect_iterator_collected_enough_test.cpp @@ -370,10 +370,9 @@ TEST_F(BlockReaderByteBudgetTest, DefaultIsZero) { EXPECT_EQ(reader.preferred_block_size_bytes(), 0); } -// Base TabletReader always returns 0 (feature unsupported at base level). -TEST_F(BlockReaderByteBudgetTest, BaseTabletReaderReturnsZero) { +// Virtual dispatch: BlockReader override is reachable through a TabletReader pointer. +TEST_F(BlockReaderByteBudgetTest, VirtualDispatchThroughTabletReaderPtr) { config::enable_adaptive_batch_size = true; - // TabletReader is abstract; use BlockReader as base pointer to test virtual dispatch. BlockReader concrete; concrete._reader_context.preferred_block_size_bytes = 99999; TabletReader* base = &concrete; diff --git a/regression-test/suites/query_p0/adaptive_batch_size/adaptive_batch_size.groovy b/regression-test/suites/query_p0/adaptive_batch_size/adaptive_batch_size.groovy index 56b342b585f..8fa691a1b79 100644 --- a/regression-test/suites/query_p0/adaptive_batch_size/adaptive_batch_size.groovy +++ b/regression-test/suites/query_p0/adaptive_batch_size/adaptive_batch_size.groovy @@ -85,8 +85,6 @@ suite("adaptive_batch_size") { assertEquals(res_enabled[i].toString(), res_disabled[i].toString()) } - // sql "drop table abs_wide_table" - // ── Test 2: narrow table (INT columns) ─────────────────────────────────── // Rows are ~12 bytes each; with adaptive=on the predictor should converge @@ -206,7 +204,9 @@ suite("adaptive_batch_size") { assertEquals(flag_off.toString(), flag_on.toString()) - // Reset session variables to defaults. + // Reset all modified session variables to defaults. sql "set preferred_block_size_bytes = 8388608" + sql "set preferred_block_size_rows = 65535" sql "set preferred_max_column_in_block_size_bytes = 1048576" + sql "set batch_size = 4096" } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
