This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 d2bf26e0f4b [Fix](topn opt) prevent from merge __TEMP__ column in
segment iterator (#29127)
d2bf26e0f4b is described below
commit d2bf26e0f4b22cb2a235a82157fbe6d068e0ad1d
Author: lihangyu <15605149...@163.com>
AuthorDate: Wed Dec 27 15:43:21 2023 +0800
[Fix](topn opt) prevent from merge __TEMP__ column in segment iterator
(#29127)
---
be/src/vec/olap/vcollect_iterator.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/be/src/vec/olap/vcollect_iterator.cpp
b/be/src/vec/olap/vcollect_iterator.cpp
index b34893b6309..6112f30a47f 100644
--- a/be/src/vec/olap/vcollect_iterator.cpp
+++ b/be/src/vec/olap/vcollect_iterator.cpp
@@ -256,11 +256,14 @@ Status VCollectIterator::_topn_next(Block* block) {
auto clone_block = block->clone_empty();
MutableBlock mutable_block =
vectorized::MutableBlock::build_mutable_block(&clone_block);
- // clear TMPE columns to avoid column align problem in
mutable_block.add_rows bellow
+ // clear TEMP columns to avoid column align problem in
mutable_block.add_rows bellow
auto all_column_names = mutable_block.get_names();
for (auto& name : all_column_names) {
if (name.rfind(BeConsts::BLOCK_TEMP_COLUMN_PREFIX, 0) == 0) {
mutable_block.erase(name);
+ // clear TEMP columns from block to prevent from storage engine
merge with this
+ // fake column
+ block->erase(name);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
