This is an automated email from the ASF dual-hosted git repository.
airborne pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 94d7f2eabca [refactor](segment iterator) rename
_non_predicate_column_ids to _common_expr_column_ids (#56931)
94d7f2eabca is described below
commit 94d7f2eabcacc957bf9536a62dc2d70242a1be8b
Author: zhiqiang <[email protected]>
AuthorDate: Tue Oct 21 18:09:34 2025 +0800
[refactor](segment iterator) rename _non_predicate_column_ids to
_common_expr_column_ids (#56931)
---
be/src/olap/rowset/segment_v2/segment_iterator.cpp | 16 ++++++++--------
be/src/olap/rowset/segment_v2/segment_iterator.h | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
index 5a974528302..1edd079ff0f 100644
--- a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
+++ b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
@@ -1817,7 +1817,7 @@ Status SegmentIterator::_vec_init_lazy_materialization() {
_lazy_materialization_read = true;
}
if (_is_common_expr_column[cid]) {
- _non_predicate_column_ids.push_back(cid);
+ _common_expr_column_ids.push_back(cid);
} else {
_non_predicate_columns.push_back(cid);
}
@@ -1846,7 +1846,7 @@ Status SegmentIterator::_vec_init_lazy_materialization() {
_short_cir_pred_column_ids.end());
pred_id_set.insert(_vec_pred_column_ids.begin(),
_vec_pred_column_ids.end());
- DCHECK(_non_predicate_column_ids.empty());
+ DCHECK(_common_expr_column_ids.empty());
// _non_predicate_column_ids must be empty. Otherwise
_lazy_materialization_read must not false.
for (int i = 0; i < _schema->num_column_ids(); i++) {
auto cid = _schema->column_id(i);
@@ -1881,7 +1881,7 @@ Status SegmentIterator::_vec_init_lazy_materialization() {
"_schema_block_id_map: [{}]",
_lazy_materialization_read, _col_predicates.size(),
fmt::join(_predicate_column_ids, ","),
fmt::join(_non_predicate_columns, ","),
- fmt::join(_non_predicate_column_ids, ","),
fmt::join(_columns_to_filter, ","),
+ fmt::join(_common_expr_column_ids, ","),
fmt::join(_columns_to_filter, ","),
fmt::join(_schema_block_id_map, ","));
return Status::OK();
}
@@ -2542,13 +2542,13 @@ Status
SegmentIterator::_next_batch_internal(vectorized::Block* block) {
// step 3.2: read remaining expr column and evaluate it.
if (_is_need_expr_eval) {
// The predicate column contains the remaining expr
column, no need second read.
- if (_non_predicate_column_ids.size() > 0) {
+ if (_common_expr_column_ids.size() > 0) {
SCOPED_RAW_TIMER(&_opts.stats->non_predicate_read_ns);
RETURN_IF_ERROR(_read_columns_by_rowids(
- _non_predicate_column_ids, _block_rowids,
_sel_rowid_idx.data(),
+ _common_expr_column_ids, _block_rowids,
_sel_rowid_idx.data(),
_selected_size, &_current_return_columns));
-
_replace_version_col_if_needed(_non_predicate_column_ids, _selected_size);
-
RETURN_IF_ERROR(_process_columns(_non_predicate_column_ids, block));
+
_replace_version_col_if_needed(_common_expr_column_ids, _selected_size);
+
RETURN_IF_ERROR(_process_columns(_common_expr_column_ids, block));
}
DCHECK(block->columns() >
_schema_block_id_map[*_common_expr_columns.begin()]);
@@ -2558,7 +2558,7 @@ Status
SegmentIterator::_next_batch_internal(vectorized::Block* block) {
} else {
_fill_column_nothing();
if (_is_need_expr_eval) {
-
RETURN_IF_ERROR(_process_columns(_non_predicate_column_ids, block));
+ RETURN_IF_ERROR(_process_columns(_common_expr_column_ids,
block));
}
}
} else if (_is_need_expr_eval) {
diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.h
b/be/src/olap/rowset/segment_v2/segment_iterator.h
index d8cfee5f0e0..010a73306d1 100644
--- a/be/src/olap/rowset/segment_v2/segment_iterator.h
+++ b/be/src/olap/rowset/segment_v2/segment_iterator.h
@@ -434,7 +434,7 @@ private:
// second, read non-predicate columns
// so we need a field to stand for columns first time to read
std::vector<ColumnId> _predicate_column_ids;
- std::vector<ColumnId> _non_predicate_column_ids;
+ std::vector<ColumnId> _common_expr_column_ids;
// TODO: Should use std::vector<size_t>
std::vector<ColumnId> _columns_to_filter;
std::vector<bool> _converted_column_ids;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
