database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "[improvement](reader) optimize for single rowset reading (#7351)" (#7427)

Browse Source 
Reverts apache/incubator-doris#7351

This commit will cause wrong result with agg table.
For example, an agg table `(k1, k2, v1 sum)` with single non-overlapping rowset

`select count(k1) from tbl1;` should using `_direct_agg_key_next_row` instead of `_agg_key_next_row`.

Otherwise it return less rows than expected.(because `_agg_key_next_row` will only do aggregation with `k1`)
This commit is contained in:
Mingyu Chen
2021-12-19 18:31:11 +08:00
committed by GitHub
parent e9536a8cf1
commit f6e598dca2
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
be/src/olap/tuple_reader.cpp
View File

@ -79,16 +79,9 @@ OLAPStatus TupleReader::init(const ReaderParams& read_params) {
auto status = _init_collect_iter(read_params, &rs_readers);
if (status != OLAP_SUCCESS) { return status; }
// optimize for single rowset reading without do aggregation when reading all columns,
// and otherwise should use _agg_key_next_row for AGG_KEYS
if (_optimize_for_single_rowset(rs_readers)) {
if(_tablet->keys_type() == AGG_KEYS && _return_columns.size() == _tablet->tablet_schema().num_columns()) {
_next_row_func = &TupleReader::_direct_agg_key_next_row;
} else if (_tablet->keys_type() == AGG_KEYS) {
_next_row_func = &TupleReader::_agg_key_next_row;
} else {
_next_row_func = &TupleReader::_direct_next_row;
}
_next_row_func = _tablet->keys_type() == AGG_KEYS ? &TupleReader::_direct_agg_key_next_row
: &TupleReader::_direct_next_row;
return OLAP_SUCCESS;
}