Merge pull request #1026 from Altinity/fix/antalya/systables-iceberg-sort

Follow-up for #959: proper spaces, remove nulls order info

Author: Enmk

src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp

@@ -678,12 +678,7 @@ String composeList(
             if (field->has("direction"))
             {
                 auto d = field->getValue<String>("direction");
-                expr += (Poco::icompare(d, "desc") == 0) ? "DESC" : "ASC";
-            }
-            if (field->has("null-order"))
-            {
-                auto n = field->getValue<String>("null-order");
-                expr += (Poco::icompare(n, "nulls-last") == 0) ? "NULLS LAST" : "NULLS FIRST";
+                expr += (Poco::icompare(d, "desc") == 0) ? " DESC" : " ASC";
             }
         }
 

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, hour(ts) asc"'
 
 @pytest.mark.parametrize("storage_type", ["local", "s3"])
 def test_compressed_metadata(started_cluster, storage_type):