From 174add572848a9de6e16654dd6c96c56d887cda5 Mon Sep 17 00:00:00 2001 From: Andrey Zvonov <32552679+zvonand@users.noreply.github.com> Date: Fri, 4 Sep 2026 15:04:14 +0200 Subject: [PATCH 1/2] Cherry-pick of https://github.com/Altinity/ClickHouse/pull/2271 with unresolved conflict markers (resolution in next commit) --- Original cherry-pick message follows: Merge pull request #2271 from Altinity/iceberg-delta-bin-deletion-vectors Support for Databricks deletion vectors # Conflicts: # src/Storages/ObjectStorage/DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp --- .../DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Storages/ObjectStorage/DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp b/src/Storages/ObjectStorage/DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp index 855a8ac25f7c..bb0b03b63353 100644 --- a/src/Storages/ObjectStorage/DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp +++ b/src/Storages/ObjectStorage/DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp @@ -85,7 +85,10 @@ std::shared_ptr makePositionDeleteEntry( /*row_number=*/0, ManifestEntryStatus::ADDED, /*written_sequence_number=*/std::nullopt, +<<<<<<< HEAD /*written_file_sequence_number=*/std::nullopt, +======= +>>>>>>> cc5dca0442e (Merge pull request #2271 from Altinity/iceberg-delta-bin-deletion-vectors) /*written_snapshot_id=*/std::nullopt, DB::Row{}, std::unordered_map{}, From 72325416a404d40ed212b33e4736fa5310016fe8 Mon Sep 17 00:00:00 2001 From: Andrey Zvonov <32552679+zvonand@users.noreply.github.com> Date: Wed, 23 Sep 2026 23:43:19 +0200 Subject: [PATCH 2/2] Resolve conflicts in cherry-pick of #2271 Kept antalya-26.8's ParsedManifestFileEntry argument list in the new gtest helper: the constructor on antalya-26.8 takes an extra written_file_sequence_number_ parameter (ManifestFile.h:123) that did not exist when #2271 was written. --- .../DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Storages/ObjectStorage/DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp b/src/Storages/ObjectStorage/DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp index bb0b03b63353..855a8ac25f7c 100644 --- a/src/Storages/ObjectStorage/DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp +++ b/src/Storages/ObjectStorage/DataLakes/tests/gtest_puffin_dv_referenced_data_file.cpp @@ -85,10 +85,7 @@ std::shared_ptr makePositionDeleteEntry( /*row_number=*/0, ManifestEntryStatus::ADDED, /*written_sequence_number=*/std::nullopt, -<<<<<<< HEAD /*written_file_sequence_number=*/std::nullopt, -======= ->>>>>>> cc5dca0442e (Merge pull request #2271 from Altinity/iceberg-delta-bin-deletion-vectors) /*written_snapshot_id=*/std::nullopt, DB::Row{}, std::unordered_map{},