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

[FIX](upgrade)fix upgrade for predict column delete collection type will make core #26006

Browse Source
This commit is contained in:
amory
2023-10-27 14:25:45 +08:00
committed by GitHub
parent 46d40b1952
commit 4ee24d8cb1
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
be/src/olap/rowset/segment_v2/segment_iterator.cpp
View File

@ -1821,8 +1821,9 @@ Status SegmentIterator::_next_batch_internal(vectorized::Block* block) {
auto cid = _schema->column_id(i);
auto column_desc = _schema->column(cid);
if (_is_pred_column[cid]) {
_current_return_columns[cid] =
Schema::get_predicate_column_ptr(*column_desc, _opts.io_ctx.reader_type);
RETURN_IF_CATCH_EXCEPTION(_current_return_columns[cid] =
Schema::get_predicate_column_ptr(
*column_desc, _opts.io_ctx.reader_type));
_current_return_columns[cid]->set_rowset_segment_id(
{_segment->rowset_id(), _segment->id()});
_current_return_columns[cid]->reserve(_opts.block_row_max);

4
be/src/olap/schema.cpp
View File

@ -209,7 +209,9 @@ vectorized::IColumn::MutablePtr Schema::get_predicate_column_ptr(const Field& fi
ptr = doris::vectorized::PredicateColumnType<TYPE_IPV6>::create();
break;
default:
LOG(FATAL) << "Unexpected type when choosing predicate column, type=" << int(field.type());
throw Exception(ErrorCode::SCHEMA_SCHEMA_FIELD_INVALID,
fmt::format("Unexpected type when choosing predicate column, type={}",
int(field.type())));
}
if (field.is_nullable()) {