This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch compaction_opt
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/compaction_opt by this push:
new edbbf3ff65 [bugfix](vertical_compaction) core when _block and
ori_return_cols not match (#14346)
edbbf3ff65 is described below
commit edbbf3ff653ff5410fd7b546d51b62884fd77eb1
Author: yixiutt <[email protected]>
AuthorDate: Thu Nov 17 11:36:48 2022 +0800
[bugfix](vertical_compaction) core when _block and ori_return_cols not
match (#14346)
---
be/src/vec/olap/vertical_merge_iterator.cpp | 4 ++--
be/src/vec/olap/vertical_merge_iterator.h | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/be/src/vec/olap/vertical_merge_iterator.cpp
b/be/src/vec/olap/vertical_merge_iterator.cpp
index 911d677b53..613f115f94 100644
--- a/be/src/vec/olap/vertical_merge_iterator.cpp
+++ b/be/src/vec/olap/vertical_merge_iterator.cpp
@@ -319,8 +319,8 @@ Status VerticalMergeIteratorContext::_load_next_block() {
}
}
// erase delete handler columns
- if (_num_columns > _ori_return_cols) {
- for (auto i = _num_columns - 1; i >= _ori_return_cols; --i) {
+ if (_block->columns() > _ori_return_cols) {
+ for (auto i = _block->columns() - 1; i >= _ori_return_cols; --i) {
_block->erase(i);
}
}
diff --git a/be/src/vec/olap/vertical_merge_iterator.h
b/be/src/vec/olap/vertical_merge_iterator.h
index 6e7fda7193..417f132500 100644
--- a/be/src/vec/olap/vertical_merge_iterator.h
+++ b/be/src/vec/olap/vertical_merge_iterator.h
@@ -132,7 +132,6 @@ public:
_ori_return_cols(ori_return_cols),
_order(order),
_seq_col_idx(seq_col_idx),
- _num_columns(iter->schema().num_column_ids()),
_num_key_columns(iter->schema().num_key_columns()) {}
VerticalMergeIteratorContext(const VerticalMergeIteratorContext&) = delete;
@@ -193,7 +192,6 @@ private:
size_t _index_in_block = -1;
// 4096 minus 16 + 16 bytes padding that in padding pod array
int _block_row_max = 4064;
- int _num_columns;
int _num_key_columns;
size_t _cur_batch_num = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
