From 4619924a59863b27aef7c105de38a4c91c185459 Mon Sep 17 00:00:00 2001
From: Anton Ivashkin <ianton@live.com>
Date: Wed, 10 Dec 2025 18:38:21 +0100
Subject: [PATCH] Fix segfault with undefined relevant_snapshot in Iceberg
 metadata

---
 .../ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp
index 0ed41e4f8409..27249f4bb0f8 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp
@@ -990,12 +990,16 @@ std::optional<size_t> IcebergMetadata::totalBytes(ContextPtr local_context) cons
 std::optional<String> IcebergMetadata::partitionKey(ContextPtr) const
 {
     SharedLockGuard lock(mutex);
+    if (!relevant_snapshot)
+        return {};
     return relevant_snapshot->partition_key;
 }
 
 std::optional<String> IcebergMetadata::sortingKey(ContextPtr) const
 {
     SharedLockGuard lock(mutex);
+    if (!relevant_snapshot)
+        return {};
     return relevant_snapshot->sorting_key;
 }