From bfeee87a0705dec35e65f8ef99e8d646ff8b7cab Mon Sep 17 00:00:00 2001
From: Kanthi Subramanian <subkanthi@gmail.com>
Date: Mon, 15 Jun 2026 23:17:50 +0200
Subject: [PATCH] Fixed listFiles call in drop table iceberg, replace
 subdirectory path, added test to make sure delete iceberg data works with
 settings enabled

---
 .../DataLakes/Iceberg/IcebergMetadata.cpp     |  2 +-
 tests/integration/helpers/iceberg_utils.py    |  5 ++--
 .../test_writes_drop_table.py                 | 27 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp
index 6016be1cd341..a9ab92794a82 100644
--- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp
@@ -1400,7 +1400,7 @@ void IcebergMetadata::drop(ContextPtr context)
 {
     if (context->getSettingsRef()[Setting::iceberg_delete_data_on_drop].value)
     {
-        auto files = listFiles(*object_storage, persistent_components.table_path, persistent_components.table_path, "");
+        auto files = listFiles(*object_storage, persistent_components.table_path, "", "");
         for (const auto & file : files)
             object_storage->removeObjectIfExists(StoredObject(file));
     }
diff --git a/tests/integration/helpers/iceberg_utils.py b/tests/integration/helpers/iceberg_utils.py
index 7548f61d7a48..5c59372d09d8 100644
--- a/tests/integration/helpers/iceberg_utils.py
+++ b/tests/integration/helpers/iceberg_utils.py
@@ -491,11 +491,12 @@ def drop_iceberg_table(
     node,
     table_name,
     if_exists=False,
+    settings=None,
 ):
     if if_exists:
-        node.query(f"DROP TABLE IF EXISTS {table_name};")
+        node.query(f"DROP TABLE IF EXISTS {table_name};", settings=settings)
     else:
-        node.query(f"DROP TABLE {table_name};")
+        node.query(f"DROP TABLE {table_name};", settings=settings)
 
 
 def create_initial_data_file(
diff --git a/tests/integration/test_storage_iceberg_with_spark/test_writes_drop_table.py b/tests/integration/test_storage_iceberg_with_spark/test_writes_drop_table.py
index cc3346d18e36..f0dd768a58f6 100644
--- a/tests/integration/test_storage_iceberg_with_spark/test_writes_drop_table.py
+++ b/tests/integration/test_storage_iceberg_with_spark/test_writes_drop_table.py
@@ -32,4 +32,29 @@ def test_writes_drop_table(started_cluster_iceberg_with_spark, format_version, s
         f"/var/lib/clickhouse/user_files/iceberg_data/default/{TABLE_NAME}/",
     )
     # drop should not delete user data
-    assert len(files) > 0
\ No newline at end of file
+    assert len(files) > 0
+
+
+@pytest.mark.parametrize("format_version", [1, 2])
+@pytest.mark.parametrize("storage_type", ["local"])
+def test_writes_drop_table_deletes_data(started_cluster_iceberg_with_spark, format_version, storage_type):
+    instance = started_cluster_iceberg_with_spark.instances["node1"]
+    TABLE_NAME = "test_writes_drop_table_deletes_data_" + storage_type + "_" + get_uuid_str()
+
+    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster_iceberg_with_spark,
+                         "(x String, y Int64)", format_version, use_version_hint=True)
+
+    instance.query(f"INSERT INTO {TABLE_NAME} VALUES ('123', 1);",
+                   settings={"allow_insert_into_iceberg": 1})
+    assert instance.query(f"SELECT * FROM {TABLE_NAME} ORDER BY ALL") == '123\t1\n'
+
+    drop_iceberg_table(instance, TABLE_NAME,
+                       settings={"iceberg_delete_data_on_drop": 1})
+
+    files = default_download_directory(
+        started_cluster_iceberg_with_spark,
+        storage_type,
+        f"/var/lib/clickhouse/user_files/iceberg_data/default/{TABLE_NAME}/",
+        f"/var/lib/clickhouse/user_files/iceberg_data/default/{TABLE_NAME}/",
+    )
+    assert len(files) == 0
\ No newline at end of file