This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new e81faeeca7f fix upgrade for predict column delete collection type will
make core (#26007)
e81faeeca7f is described below
commit e81faeeca7fd70235d05ce173d3147259f6af8b0
Author: amory <wangqian...@selectdb.com>
AuthorDate: Fri Oct 27 16:47:27 2023 +0800
fix upgrade for predict column delete collection type will make core
(#26007)
---
be/src/olap/rowset/segment_v2/segment_iterator.cpp | 5 +++--
be/src/olap/schema.cpp | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
index ce04b05d4b4..28274752b05 100644
--- a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
+++ b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
@@ -1816,8 +1816,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);
diff --git a/be/src/olap/schema.cpp b/be/src/olap/schema.cpp
index a3297b4c2fa..d6c737de03c 100644
--- a/be/src/olap/schema.cpp
+++ b/be/src/olap/schema.cpp
@@ -200,7 +200,9 @@ vectorized::IColumn::MutablePtr
Schema::get_predicate_column_ptr(const Field& fi
ptr =
doris::vectorized::PredicateColumnType<TYPE_DECIMAL128I>::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()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
