This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 2efec46f909 [fix](block) fix be core while mutable block merge may
cause different row size between columns in origin block (#28850) (#29035)
2efec46f909 is described below
commit 2efec46f909915172f6c2bec857819a4b1f8960a
Author: caiconghui <[email protected]>
AuthorDate: Thu Dec 28 10:20:12 2023 +0800
[fix](block) fix be core while mutable block merge may cause different row
size between columns in origin block (#28850) (#29035)
---
be/src/vec/exec/scan/scanner_scheduler.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/be/src/vec/exec/scan/scanner_scheduler.cpp
b/be/src/vec/exec/scan/scanner_scheduler.cpp
index 023f46cf2c1..52a30e991fd 100644
--- a/be/src/vec/exec/scan/scanner_scheduler.cpp
+++ b/be/src/vec/exec/scan/scanner_scheduler.cpp
@@ -410,10 +410,12 @@ void ScannerScheduler::_scanner_scan(ScannerScheduler*
scheduler, ScannerContext
ctx->return_free_block(std::move(block));
} else {
if (!blocks.empty() && blocks.back()->rows() + block->rows() <=
state->batch_size()) {
- status =
vectorized::MutableBlock(blocks.back().get()).merge(*block);
+ vectorized::MutableBlock mutable_block(blocks.back().get());
+ status = mutable_block.merge(*block);
if (!status.ok()) {
break;
}
+
blocks.back()->set_columns(std::move(mutable_block.mutable_columns()));
ctx->return_free_block(std::move(block));
} else {
blocks.push_back(std::move(block));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
