xy720 commented on code in PR #15966: URL: https://github.com/apache/doris/pull/15966#discussion_r1072244337
########## be/src/olap/rowset/segment_v2/column_writer.cpp: ########## @@ -173,6 +173,119 @@ Status ColumnWriter::create(const ColumnWriterOptions& opts, const TabletColumn* *writer = std::move(writer_local); return Status::OK(); } + case FieldType::OLAP_FIELD_TYPE_MAP: { + DCHECK(column->get_subtype_count() == 2); + // todo . here key and value is array only? + const TabletColumn& key_column = column->get_sub_column(0); // field_type is true key and value + const TabletColumn& value_column = column->get_sub_column(1); + + // create null writer + ScalarColumnWriter* null_writer = nullptr; + if (opts.meta->is_nullable()) { + FieldType null_type = FieldType::OLAP_FIELD_TYPE_TINYINT; + ColumnWriterOptions null_options; + null_options.meta = opts.meta->add_children_columns(); + null_options.meta->set_column_id(3); + null_options.meta->set_unique_id(3); + null_options.meta->set_type(null_type); + null_options.meta->set_is_nullable(false); + null_options.meta->set_length( + get_scalar_type_info<OLAP_FIELD_TYPE_TINYINT>()->size()); + null_options.meta->set_encoding(DEFAULT_ENCODING); + null_options.meta->set_compression(opts.meta->compression()); + + null_options.need_zone_map = false; + null_options.need_bloom_filter = false; + null_options.need_bitmap_index = false; + + TabletColumn null_column = TabletColumn( + OLAP_FIELD_AGGREGATION_NONE, null_type, false, + null_options.meta->unique_id(), null_options.meta->length()); + null_column.set_name("nullable"); + null_column.set_index_length(-1); // no short key index + std::unique_ptr<Field> null_field(FieldFactory::create(null_column)); + null_writer = + new ScalarColumnWriter(null_options, std::move(null_field), file_writer); + } + + // create key writer + std::unique_ptr<ColumnWriter> key_writer; + ColumnWriterOptions key_opts; + TabletColumn key_list_column(OLAP_FIELD_AGGREGATION_NONE, OLAP_FIELD_TYPE_ARRAY); + { + key_list_column.add_sub_column(const_cast<TabletColumn&>(key_column)); +// key_list_column.add_sub_column(key_column); + key_list_column.set_name("map.key"); + key_list_column.set_index_length(-1); + + + key_opts.meta = opts.meta->mutable_children_columns(0); + key_opts.meta->set_column_id(4); + key_opts.meta->set_unique_id(4); + key_opts.meta->set_type(OLAP_FIELD_TYPE_ARRAY); + key_opts.meta->set_length(0); + key_opts.meta->set_encoding(BIT_SHUFFLE); + key_opts.meta->set_compression(segment_v2::CompressionTypePB::LZ4F); + key_opts.need_zone_map = false; + // no need key array's null map + key_opts.meta->set_is_nullable(false); + + ColumnMetaPB* child_meta = key_opts.meta->add_children_columns(); + child_meta->set_column_id(5); + child_meta->set_unique_id(5); + child_meta->set_type(key_column.type()); + child_meta->set_length(key_column.length()); + child_meta->set_compression(segment_v2::CompressionTypePB::LZ4F); + child_meta->set_encoding(DICT_ENCODING); + child_meta->set_is_nullable(key_column.is_nullable()); + } + + RETURN_IF_ERROR( + ColumnWriter::create(key_opts, &key_list_column, file_writer, &key_writer)); + + + // create value writer + std::unique_ptr<ColumnWriter> value_writer; Review Comment: value_writer and key_writer look very same. Why not use for loop to clean the code. ########## be/src/vec/columns/column_map.h: ########## @@ -0,0 +1,133 @@ +#pragma once + Review Comment: Add a comment here if this file is copied from Clickhouse and modified by Doris. ########## be/src/vec/core/field.h: ########## @@ -85,6 +85,7 @@ using FieldVector = std::vector<Field>; DEFINE_FIELD_VECTOR(Array); DEFINE_FIELD_VECTOR(Tuple); +DEFINE_FIELD_VECTOR(Map); Review Comment: Now is vector<Field>{key1, val1, key2, val2} with double size? ########## be/src/vec/columns/column_map.h: ########## @@ -0,0 +1,133 @@ +#pragma once Review Comment: Add licence. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org