From 3dcc2056a59f9b374b4de3b72c30107dd7825d47 Mon Sep 17 00:00:00 2001
From: avogar <avogar@clickhouse.com>
Date: Thu, 18 Jan 2024 20:39:36 +0000
Subject: [PATCH] Fix conflicts

---
 src/DataTypes/Serializations/ISerialization.cpp       | 1 +
 src/DataTypes/Serializations/ISerialization.h         | 1 +
 src/DataTypes/Serializations/SerializationVariant.cpp | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/DataTypes/Serializations/ISerialization.cpp b/src/DataTypes/Serializations/ISerialization.cpp
index 2f1eb1887af..7d57d72090b 100644
--- a/src/DataTypes/Serializations/ISerialization.cpp
+++ b/src/DataTypes/Serializations/ISerialization.cpp
@@ -54,6 +54,7 @@ const std::set<SubstreamType> ISerialization::Substream::named_types
     TupleElement,
     NamedOffsets,
     NamedNullMap,
+    NamedVariantDiscriminators,
 };
 
 String ISerialization::Substream::toString() const
diff --git a/src/DataTypes/Serializations/ISerialization.h b/src/DataTypes/Serializations/ISerialization.h
index 64a7a889640..7fba9db4acf 100644
--- a/src/DataTypes/Serializations/ISerialization.h
+++ b/src/DataTypes/Serializations/ISerialization.h
@@ -155,6 +155,7 @@ public:
             ObjectData,
 
             VariantDiscriminators,
+            NamedVariantDiscriminators,
             VariantOffsets,
             VariantElements,
             VariantElement,
diff --git a/src/DataTypes/Serializations/SerializationVariant.cpp b/src/DataTypes/Serializations/SerializationVariant.cpp
index 48a78dd54a9..5af94364167 100644
--- a/src/DataTypes/Serializations/SerializationVariant.cpp
+++ b/src/DataTypes/Serializations/SerializationVariant.cpp
@@ -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);