Skip to content

Commit a755cbc

Browse files
committed
Apply suggestion
1 parent d58dba3 commit a755cbc

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/Functions/FunctionsConversion.h

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,20 +2009,16 @@ struct ConvertImplFromDynamicToColumn
20092009

20102010
/// First, cast usual variants to result type.
20112011
const auto & variant_types = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariants();
2012-
std::vector<ColumnPtr> cast_variant_columns;
2013-
cast_variant_columns.reserve(variant_types.size());
2012+
std::vector<ColumnPtr> cast_variant_columns(variant_types.size());
20142013
for (size_t i = 0; i != variant_types.size(); ++i)
20152014
{
20162015
/// Skip shared variant, it will be processed later.
20172016
if (i == column_dynamic.getSharedVariantDiscriminator())
2018-
{
2019-
cast_variant_columns.push_back(nullptr);
20202017
continue;
2021-
}
20222018

20232019
ColumnsWithTypeAndName new_args = arguments;
20242020
new_args[0] = {variant_column.getVariantPtrByGlobalDiscriminator(i), variant_types[i], ""};
2025-
cast_variant_columns.push_back(nested_convert(new_args, result_type));
2021+
cast_variant_columns[i] = nested_convert(new_args, result_type);
20262022
}
20272023

20282024
/// Second, collect all variants stored in shared variant and cast them to result type.
@@ -2073,13 +2069,12 @@ struct ConvertImplFromDynamicToColumn
20732069
}
20742070

20752071
/// Cast all extracted variants into result type.
2076-
std::vector<ColumnPtr> cast_shared_variant_columns;
2077-
cast_shared_variant_columns.reserve(variant_types_from_shared_variant.size());
2072+
std::vector<ColumnPtr> cast_shared_variant_columns(variant_types_from_shared_variant.size());
20782073
for (size_t i = 0; i != variant_types_from_shared_variant.size(); ++i)
20792074
{
20802075
ColumnsWithTypeAndName new_args = arguments;
20812076
new_args[0] = {variant_columns_from_shared_variant[i]->getPtr(), variant_types_from_shared_variant[i], ""};
2082-
cast_shared_variant_columns.push_back(nested_convert(new_args, result_type));
2077+
cast_shared_variant_columns[i] = nested_convert(new_args, result_type);
20832078
}
20842079

20852080
/// Construct result column from all cast variants.

0 commit comments

Comments
 (0)