From b7e1588be9a27524a38e469bb6ea24cd9d7bf77f Mon Sep 17 00:00:00 2001 From: amory Date: Fri, 2 Aug 2024 11:20:20 +0800 Subject: [PATCH] [pick](upgrade)fix log message (#38710) ## Proposed changes backport: https://github.com/apache/doris/pull/38254 Issue Number: close #xxx --- be/src/olap/tablet_schema.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/be/src/olap/tablet_schema.cpp b/be/src/olap/tablet_schema.cpp index 26d9d913f2..a2ef2649b4 100644 --- a/be/src/olap/tablet_schema.cpp +++ b/be/src/olap/tablet_schema.cpp @@ -547,11 +547,18 @@ void TabletColumn::init_from_pb(const ColumnPB& column) { _visible = column.visible(); } if (_type == FieldType::OLAP_FIELD_TYPE_ARRAY) { - CHECK(column.children_columns_size() == 1) << "ARRAY type has more than 1 children types."; + CHECK(column.children_columns_size() == 1) + << "ARRAY type should has 1 children types, but got " + << column.children_columns_size(); } if (_type == FieldType::OLAP_FIELD_TYPE_MAP) { - DCHECK(column.children_columns_size() == 2) << "MAP type has more than 2 children types."; - LOG(WARNING) << "MAP type has more than 2 children types."; + DCHECK(column.children_columns_size() == 2) + << "MAP type should has 2 children types, but got " + << column.children_columns_size(); + if (UNLIKELY(column.children_columns_size() != 2)) { + LOG(WARNING) << "MAP type should has 2 children types, but got " + << column.children_columns_size(); + } } for (size_t i = 0; i < column.children_columns_size(); i++) { TabletColumn child_column; @@ -617,11 +624,15 @@ void TabletColumn::to_schema_pb(ColumnPB* column) const { column->set_visible(_visible); if (_type == FieldType::OLAP_FIELD_TYPE_ARRAY) { - CHECK(_sub_columns.size() == 1) << "ARRAY type has more than 1 children types."; + CHECK(_sub_columns.size() == 1) + << "ARRAY type should has 1 children types, but got " << _sub_columns.size(); } if (_type == FieldType::OLAP_FIELD_TYPE_MAP) { - DCHECK(_sub_columns.size() == 2) << "MAP type has more than 2 children types."; - LOG(WARNING) << "MAP type has more than 2 children types."; + DCHECK(_sub_columns.size() == 2) + << "MAP type should has 2 children types, but got " << _sub_columns.size(); + if (UNLIKELY(_sub_columns.size() != 2)) { + LOG(WARNING) << "MAP type should has 2 children types, but got " << _sub_columns.size(); + } } for (size_t i = 0; i < _sub_columns.size(); i++) {