From 343d7d676b9c125b1e9d14eb7232952ab0137550 Mon Sep 17 00:00:00 2001 From: Andrey Zvonov Date: Thu, 18 Sep 2025 18:25:39 +0200 Subject: [PATCH 1/2] add spaces --- .../ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp | 4 ++-- tests/integration/test_storage_iceberg/test.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp index de02ced00c4d..48166cc7e597 100644 --- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp +++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp @@ -678,12 +678,12 @@ String composeList( if (field->has("direction")) { auto d = field->getValue("direction"); - expr += (Poco::icompare(d, "desc") == 0) ? "DESC" : "ASC"; + expr += (Poco::icompare(d, "desc") == 0) ? " DESC" : " ASC"; } if (field->has("null-order")) { auto n = field->getValue("null-order"); - expr += (Poco::icompare(n, "nulls-last") == 0) ? "NULLS LAST" : "NULLS FIRST"; + expr += (Poco::icompare(n, "nulls-last") == 0) ? " NULLS LAST" : " NULLS FIRST"; } } diff --git a/tests/integration/test_storage_iceberg/test.py b/tests/integration/test_storage_iceberg/test.py index d08ab8d6605e..57f95d0ef470 100644 --- a/tests/integration/test_storage_iceberg/test.py +++ b/tests/integration/test_storage_iceberg/test.py @@ -3453,7 +3453,7 @@ def test_system_tables_partition_sorting_keys(started_cluster, storage_type): WHERE name = '{table_name}' FORMAT csv """).strip().lower() - assert res == '"bucket(16, id), day(ts)","iddescnulls last, hour(ts)ascnulls first"' + assert res == '"bucket(16, id), day(ts)","id desc nulls last, hour(ts) asc nulls first"' @pytest.mark.parametrize("storage_type", ["local", "s3"]) def test_compressed_metadata(started_cluster, storage_type): From 634c6dae017dceaf5045a9cdb08012e213f560e6 Mon Sep 17 00:00:00 2001 From: Andrey Zvonov Date: Thu, 18 Sep 2025 19:58:13 +0200 Subject: [PATCH 2/2] remove unneeded info --- .../ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp | 5 ----- tests/integration/test_storage_iceberg/test.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp index 48166cc7e597..2af04ec743f0 100644 --- a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp +++ b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp @@ -680,11 +680,6 @@ String composeList( auto d = field->getValue("direction"); expr += (Poco::icompare(d, "desc") == 0) ? " DESC" : " ASC"; } - if (field->has("null-order")) - { - auto n = field->getValue("null-order"); - expr += (Poco::icompare(n, "nulls-last") == 0) ? " NULLS LAST" : " NULLS FIRST"; - } } parts.push_back(std::move(expr)); diff --git a/tests/integration/test_storage_iceberg/test.py b/tests/integration/test_storage_iceberg/test.py index 57f95d0ef470..569ca8faa8a4 100644 --- a/tests/integration/test_storage_iceberg/test.py +++ b/tests/integration/test_storage_iceberg/test.py @@ -3453,7 +3453,7 @@ def test_system_tables_partition_sorting_keys(started_cluster, storage_type): WHERE name = '{table_name}' FORMAT csv """).strip().lower() - assert res == '"bucket(16, id), day(ts)","id desc nulls last, hour(ts) asc nulls first"' + assert res == '"bucket(16, id), day(ts)","id desc, hour(ts) asc"' @pytest.mark.parametrize("storage_type", ["local", "s3"]) def test_compressed_metadata(started_cluster, storage_type):