Skip to content

[fix](reader) avoid be coredump in block reader in abnormal situation #34878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 1 commit into from
May 15, 2024
Merged

[fix](reader) avoid be coredump in block reader in abnormal situation #34878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions be/src/vec/olap/block_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ Status BlockReader::_init_collect_iter(const ReaderParams& read_params) {
return Status::OK();
}

void BlockReader::_init_agg_state(const ReaderParams& read_params) {
Status BlockReader::_init_agg_state(const ReaderParams& read_params) {
if (_eof) {
return;
return Status::OK();
}

_stored_data_columns =
Expand All @@ -182,7 +182,14 @@ void BlockReader::_init_agg_state(const ReaderParams& read_params) {
AggregateFunctionPtr function =
column.get_aggregate_function(vectorized::AGG_READER_SUFFIX);

DCHECK(function != nullptr);
// to avoid coredump when something goes wrong(i.e. column missmatch)
if (!function) {
return Status::InternalError(
"Failed to init reader when init agg state: "
"tablet_id: {}, schema_hash: {}, reader_type: {}, version: {}",
read_params.tablet->tablet_id(), read_params.tablet->schema_hash(),
int(read_params.reader_type), read_params.version.to_string());
}
_agg_functions.push_back(function);
// create aggregate data
AggregateDataPtr place = new char[function->size_of_data()];
Expand All @@ -195,6 +202,8 @@ void BlockReader::_init_agg_state(const ReaderParams& read_params) {
// calculate `_has_variable_length_tag` tag. like string, array, map
_stored_has_variable_length_tag[idx] = _stored_data_columns[idx]->is_variable_length();
}

return Status::OK();
}

Status BlockReader::init(const ReaderParams& read_params) {
Expand Down Expand Up @@ -247,7 +256,7 @@ Status BlockReader::init(const ReaderParams& read_params) {
break;
case KeysType::AGG_KEYS:
_next_block_func = &BlockReader::_agg_key_next_block;
_init_agg_state(read_params);
RETURN_IF_ERROR(_init_agg_state(read_params));
break;
default:
DCHECK(false) << "No next row function for type:" << tablet()->keys_type();
Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/olap/block_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class BlockReader final : public TabletReader {

Status _init_collect_iter(const ReaderParams& read_params);

void _init_agg_state(const ReaderParams& read_params);
Status _init_agg_state(const ReaderParams& read_params);

Status _insert_data_normal(MutableColumns& columns);

Expand Down