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

[fix](topn) add defensive code in topn opt to avoid crash due to column not in tablet schema

Browse Source
This commit is contained in:
Kang
2023-11-17 07:14:10 -06:00
committed by GitHub
parent c459408580
commit 0a1a6cf02f
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
be/src/runtime/runtime_predicate.cpp
View File

@ -135,11 +135,6 @@ Status RuntimePredicate::update(const Field& value, const String& col_name, bool
std::unique_lock<std::shared_mutex> wlock(_rwlock);
// TODO why null
if (!_tablet_schema) {
return Status::OK();
}
bool updated = false;
if (UNLIKELY(_orderby_extrem.is_null())) {
@ -161,6 +156,10 @@ Status RuntimePredicate::update(const Field& value, const String& col_name, bool
return Status::OK();
}
// TODO defensive code
if (!_tablet_schema || !_tablet_schema->have_column(col_name)) {
return Status::OK();
}
// update _predictate
int32_t col_unique_id = _tablet_schema->column(col_name).unique_id();
const TabletColumn& column = _tablet_schema->column_by_uid(col_unique_id);

4
be/src/runtime/runtime_predicate.h
View File

@ -66,8 +66,8 @@ private:
mutable std::shared_mutex _rwlock;
Field _orderby_extrem {Field::Types::Null};
std::shared_ptr<ColumnPredicate> _predictate {nullptr};
TabletSchemaSPtr _tablet_schema;
std::unique_ptr<Arena> _predicate_arena;
TabletSchemaSPtr _tablet_schema {nullptr};
std::unique_ptr<Arena> _predicate_arena {nullptr};
std::function<std::string(const Field&)> _get_value_fn;
bool _nulls_first = true;
bool _inited = false;