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

[pick](upgrade)fix log message (#38710)

Browse Source 
## Proposed changes
backport: https://github.com/apache/doris/pull/38254
Issue Number: close #xxx

<!--Describe your changes.-->
This commit is contained in:
amory
2024-08-02 11:20:20 +08:00
committed by GitHub
parent 84d9b2fcf4
commit b7e1588be9
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
be/src/olap/tablet_schema.cpp
View File

@ -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++) {