From bedf5e8a5f3a4fe1e62c1155bde9350bc422f284 Mon Sep 17 00:00:00 2001 From: amorynan Date: Thu, 27 Jun 2024 18:00:51 +0800 Subject: [PATCH] fix upgrade behavior from 1.2 version --- be/src/olap/rowset/segment_v2/column_reader.cpp | 1 + be/src/olap/rowset/segment_v2/column_writer.cpp | 7 ++++++- be/src/olap/tablet_schema.cpp | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/be/src/olap/rowset/segment_v2/column_reader.cpp b/be/src/olap/rowset/segment_v2/column_reader.cpp index 7396bce1a5553e..39171a040ed9b0 100644 --- a/be/src/olap/rowset/segment_v2/column_reader.cpp +++ b/be/src/olap/rowset/segment_v2/column_reader.cpp @@ -128,6 +128,7 @@ Status ColumnReader::create_map(const ColumnReaderOptions& opts, const ColumnMet const io::FileReaderSPtr& file_reader, std::unique_ptr* reader) { // map reader now has 3 sub readers for key, value, offsets(scalar), null(scala) + DCHECK(meta.children_columns_size() == 3 || meta.children_columns_size() == 4); std::unique_ptr key_reader; RETURN_IF_ERROR(ColumnReader::create(opts, meta.children_columns(0), meta.children_columns(0).num_rows(), file_reader, diff --git a/be/src/olap/rowset/segment_v2/column_writer.cpp b/be/src/olap/rowset/segment_v2/column_writer.cpp index 016a932b27636c..798cbe082613ca 100644 --- a/be/src/olap/rowset/segment_v2/column_writer.cpp +++ b/be/src/olap/rowset/segment_v2/column_writer.cpp @@ -206,6 +206,11 @@ Status ColumnWriter::create_map_writer(const ColumnWriterOptions& opts, const Ta io::FileWriter* file_writer, std::unique_ptr* writer) { DCHECK(column->get_subtype_count() == 2); + if (column->get_subtype_count() < 2) { + return Status::InternalError( + "If you upgraded from version 1.2.*, please DROP the MAP columns and then " + "ADD the MAP columns back."); + } // create key & value writer std::vector> inner_writer_list; for (int i = 0; i < 2; ++i) { @@ -1141,4 +1146,4 @@ Status MapColumnWriter::write_inverted_index() { return Status::OK(); } -} // namespace doris::segment_v2 \ No newline at end of file +} // namespace doris::segment_v2 diff --git a/be/src/olap/tablet_schema.cpp b/be/src/olap/tablet_schema.cpp index cee6f3e2d2e66e..ec887f14a91377 100644 --- a/be/src/olap/tablet_schema.cpp +++ b/be/src/olap/tablet_schema.cpp @@ -553,7 +553,8 @@ void TabletColumn::init_from_pb(const ColumnPB& column) { CHECK(column.children_columns_size() == 1) << "ARRAY type has more than 1 children types."; } if (_type == FieldType::OLAP_FIELD_TYPE_MAP) { - CHECK(column.children_columns_size() == 2) << "MAP type has more than 2 children types."; + DCHECK(column.children_columns_size() == 2) << "MAP type has more than 2 children types."; + LOG(WARNING) << "MAP type has more than 2 children types."; } for (size_t i = 0; i < column.children_columns_size(); i++) { TabletColumn child_column; @@ -623,7 +624,8 @@ void TabletColumn::to_schema_pb(ColumnPB* column) const { CHECK(_sub_columns.size() == 1) << "ARRAY type has more than 1 children types."; } if (_type == FieldType::OLAP_FIELD_TYPE_MAP) { - CHECK(_sub_columns.size() == 2) << "MAP type has more than 2 children types."; + DCHECK(_sub_columns.size() == 2) << "MAP type has more than 2 children types."; + LOG(WARNING) << "MAP type has more than 2 children types."; } for (size_t i = 0; i < _sub_columns.size(); i++) {