thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-11 08:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
avogar 2024-01-18 20:39:36 +00:00
parent 5444cde408
commit 3dcc2056a5
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/DataTypes/Serializations/ISerialization.cpp
View File

@ -54,6 +54,7 @@ const std::set<SubstreamType> ISerialization::Substream::named_types
TupleElement,
NamedOffsets,
NamedNullMap,
NamedVariantDiscriminators,
};
String ISerialization::Substream::toString() const

1
src/DataTypes/Serializations/ISerialization.h
View File

@ -155,6 +155,7 @@ public:
ObjectData,
VariantDiscriminators,
NamedVariantDiscriminators,
VariantOffsets,
VariantElements,
VariantElement,

2
src/DataTypes/Serializations/SerializationVariant.cpp
View File

@ -36,7 +36,7 @@ void SerializationVariant::enumerateStreams(
const auto * type_variant = data.type ? &assert_cast<const DataTypeVariant &>(*data.type) : nullptr;
const auto * column_variant = data.column ? &assert_cast<const ColumnVariant &>(*data.column) : nullptr;
auto discriminators_serialization = std::make_shared<SerializationNamed>(std::make_shared<SerializationNumber<ColumnVariant::Discriminator>>(), "discr", false);
auto discriminators_serialization = std::make_shared<SerializationNamed>(std::make_shared<SerializationNumber<ColumnVariant::Discriminator>>(), "discr", SubstreamType::NamedVariantDiscriminators);
auto local_discriminators = column_variant ? column_variant->getLocalDiscriminatorsPtr() : nullptr;
settings.path.push_back(Substream::VariantDiscriminators);