thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix buffer reusage

Browse Source
This commit is contained in:
avogar 2024-09-09 10:52:27 +00:00
parent a2c88ca6ef
commit 45c7818492
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/DataTypes/Serializations/SerializationDynamic.cpp
View File

@ -566,7 +566,6 @@ static void deserializeTextImpl(
const auto & variant_info = dynamic_column.getVariantInfo();
const auto & variant_types = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariants();
String field = read_field(istr);
auto field_buf = std::make_unique<ReadBufferFromString>(field);
JSONInferenceInfo json_info;
auto variant_type = tryInferDataTypeByEscapingRule(field, settings, escaping_rule, &json_info);
if (escaping_rule == FormatSettings::EscapingRule::JSON)
@ -580,7 +579,7 @@ static void deserializeTextImpl(
size_t shared_variant_discr = dynamic_column.getSharedVariantDiscriminator();
for (size_t i = 0; i != variant_types.size(); ++i)
{
field_buf = std::make_unique<ReadBufferFromString>(field);
auto field_buf = std::make_unique<ReadBufferFromString>(field);
if (i != shared_variant_discr
&& deserializeVariant<bool>(
variant_column,
@ -600,6 +599,7 @@ static void deserializeTextImpl(
if (dynamic_column.addNewVariant(variant_type, variant_type->getName()))
{
auto field_buf = std::make_unique<ReadBufferFromString>(field);
auto discr = variant_info.variant_name_to_discriminator.at(variant_type->getName());
deserializeVariant(dynamic_column.getVariantColumn(), dynamic_column.getVariantSerialization(variant_type), discr, *field_buf, deserialize_variant);
return;
@ -607,7 +607,7 @@ static void deserializeTextImpl(
/// We couldn't add new variant. Insert it into shared variant.
auto tmp_variant_column = variant_type->createColumn();
field_buf = std::make_unique<ReadBufferFromString>(field);
auto field_buf = std::make_unique<ReadBufferFromString>(field);
auto variant_type_name = variant_type->getName();
deserialize_variant(*dynamic_column.getVariantSerialization(variant_type, variant_type_name), *tmp_variant_column, *field_buf);
dynamic_column.insertValueIntoSharedVariant(*tmp_variant_column, variant_type, variant_type_name, 0);