eldenmoon commented on code in PR #34925:
URL: https://github.com/apache/doris/pull/34925#discussion_r1619031619
##########
be/src/vec/olap/olap_data_convertor.cpp:
##########
@@ -1071,28 +1081,29 @@ void
OlapBlockDataConvertor::OlapColumnDataConvertorVariant::set_source_column(
? assert_cast<const
vectorized::ColumnObject&>(*typed_column.column)
: assert_cast<const vectorized::ColumnObject&>(
nullable_column->get_nested_column());
-
- const_cast<ColumnObject&>(variant).finalize_if_not();
if (variant.is_null_root()) {
auto root_type =
make_nullable(std::make_shared<ColumnObject::MostCommonType>());
auto root_col = root_type->create_column();
root_col->insert_many_defaults(variant.rows());
const_cast<ColumnObject&>(variant).create_root(root_type,
std::move(root_col));
variant.check_consistency();
}
- auto root_of_variant = variant.get_root();
- auto nullable = assert_cast<const ColumnNullable*>(root_of_variant.get());
- CHECK(nullable);
- _root_data_column = assert_cast<const
ColumnString*>(&nullable->get_nested_column());
- _root_data_convertor->set_source_column({root_of_variant->get_ptr(),
nullptr, ""}, row_pos,
- num_rows);
+ // ensure data finalized
+ _source_column_ptr = &const_cast<ColumnObject&>(variant);
+ _source_column_ptr->finalize(false);
+ _root_data_convertor =
std::make_unique<OlapColumnDataConvertorVarChar>(true);
OlapBlockDataConvertor::OlapColumnDataConvertorBase::set_source_column(typed_column,
row_pos,
num_rows);
}
// convert root data
Status
OlapBlockDataConvertor::OlapColumnDataConvertorVariant::convert_to_olap() {
- RETURN_IF_ERROR(_root_data_convertor->convert_to_olap(_nullmap,
_root_data_column));
+
RETURN_IF_ERROR(vectorized::schema_util::encode_variant_sparse_subcolumns(*_source_column_ptr));
+ _root_data_convertor->set_source_column(
Review Comment:
fixed
--
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
