[Enhancement] desc iceberg table with transform type (backport #49094)

fe/fe-core/src/main/java/com/starrocks/catalog/IcebergTable.java

@@ -45,6 +45,7 @@
 import com.starrocks.thrift.TTableType;
 import org.apache.iceberg.BaseTable;
 import org.apache.iceberg.PartitionField;
+import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.Snapshot;
 import org.apache.iceberg.SortField;
@@ -283,6 +284,11 @@ public List<String> getPartitionColumnNames() {
                 .collect(Collectors.toList());
     }
 
+    public List<String> getPartitionColumnNamesWithTransform() {
+        PartitionSpec partitionSpec = getNativeTable().spec();
+        return IcebergApiConverter.toPartitionFields(partitionSpec);
+    }
+
     @Override
     public String getTableIdentifier() {
         String uuid = ((BaseTable) getNativeTable()).operations().current().uuid();
@@ -319,14 +325,6 @@ public org.apache.iceberg.Table getNativeTable() {
         return nativeTable;
     }
 
-    public long getRefreshSnapshotTime() {
-        return refreshSnapshotTime;
-    }
-
-    public void setRefreshSnapshotTime(long refreshSnapshotTime) {
-        this.refreshSnapshotTime = refreshSnapshotTime;
-    }
-
     public void setIdentifierFieldIds(Set<Integer> identifierFieldIds) {
         this.identifierFieldIds = identifierFieldIds;
     }

fe/fe-core/src/main/java/com/starrocks/connector/iceberg/IcebergApiConverter.java

@@ -33,6 +33,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.iceberg.FileFormat;
 import org.apache.iceberg.Metrics;
+import org.apache.iceberg.PartitionField;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.Table;
@@ -50,16 +51,22 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.starrocks.analysis.OutFileClause.PARQUET_COMPRESSION_TYPE_MAP;
 import static com.starrocks.connector.ColumnTypeConverter.fromIcebergType;
 import static com.starrocks.connector.ConnectorTableId.CONNECTOR_ID_GENERATOR;
 import static com.starrocks.connector.iceberg.IcebergConnector.ICEBERG_CATALOG_TYPE;
 import static com.starrocks.server.CatalogMgr.ResourceMappingCatalog.toResourceName;
+import static java.lang.String.format;
 
 public class IcebergApiConverter {
     private static final Logger LOG = LogManager.getLogger(IcebergApiConverter.class);
     public static final String PARTITION_NULL_VALUE = "null";
+    private static final Pattern ICEBERG_BUCKET_PATTERN = Pattern.compile("bucket\\[(\\d+)]");
+    private static final Pattern ICEBERG_TRUNCATE_PATTERN = Pattern.compile("truncate\\[(\\d+)]");
     private static final int FAKE_FIELD_ID = -1;
 
     public static IcebergTable toIcebergTable(Table nativeTbl, String catalogName, String remoteDbName,
@@ -293,4 +300,38 @@ public static Map<String, String> rebuildCreateTableProperties(Map<String, Strin
 
         return tableProperties.build();
     }
+
+    public static List<String> toPartitionFields(PartitionSpec spec) {
+        return spec.fields().stream()
+                .map(field -> toPartitionField(spec, field))
+                .collect(toImmutableList());
+    }
+
+    private static String toPartitionField(PartitionSpec spec, PartitionField field) {
+        String name = spec.schema().findColumnName(field.sourceId());
+        String transform = field.transform().toString();
+
+        switch (transform) {
+            case "identity":
+                return name;
+            case "year":
+            case "month":
+            case "day":
+            case "hour":
+            case "void":
+                return format("%s(%s)", transform, name);
+        }
+
+        Matcher matcher = ICEBERG_BUCKET_PATTERN.matcher(transform);
+        if (matcher.matches()) {
+            return format("bucket(%s, %s)", name, matcher.group(1));
+        }
+
+        matcher = ICEBERG_TRUNCATE_PATTERN.matcher(transform);
+        if (matcher.matches()) {
+            return format("truncate(%s, %s)", name, matcher.group(1));
+        }
+
+        throw new StarRocksConnectorException("Unsupported partition transform: " + field);
+    }
 }

fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AstToStringBuilder.java

@@ -57,6 +57,7 @@
 import com.starrocks.catalog.HiveMetaStoreTable;
 import com.starrocks.catalog.HiveTable;
 import com.starrocks.catalog.HiveView;
+import com.starrocks.catalog.IcebergTable;
 import com.starrocks.catalog.Table;
 import com.starrocks.common.Pair;
 import com.starrocks.common.util.ParseUtil;
@@ -1351,10 +1352,17 @@ public static String getExternalCatalogTableDdlStmt(Table table) {
                 .append("\n)");
 
         // Partition column names
+        List<String> partitionNames;
         if (table.getType() != JDBC && !table.isUnPartitioned()) {
-            createTableSql.append("\nPARTITION BY ( ")
-                    .append(String.join(", ", table.getPartitionColumnNames()))
-                    .append(" )");
+            createTableSql.append("\nPARTITION BY (");
+
+            if (!table.isIcebergTable()) {
+                partitionNames = table.getPartitionColumnNames();
+            } else {
+                partitionNames = ((IcebergTable) table).getPartitionColumnNamesWithTransform();
+            }
+
+            createTableSql.append(String.join(", ", partitionNames)).append(")");
         }
 
         // Location

fe/fe-core/src/test/java/com/starrocks/connector/hive/HiveMetadataTest.java

@@ -263,7 +263,7 @@ public void testShowCreateHiveTbl() {
                 "  `col2` int(11) DEFAULT NULL,\n" +
                 "  `col1` int(11) DEFAULT NULL\n" +
                 ")\n" +
-                "PARTITION BY ( col1 )\n" +
+                "PARTITION BY (col1)\n" +
                 "PROPERTIES (\"location\" = \"hdfs://127.0.0.1:10000/hive\");",
                 AstToStringBuilder.getExternalCatalogTableDdlStmt(hiveTable));
     }

fe/fe-core/src/test/java/com/starrocks/qe/ShowExecutorTest.java

@@ -1093,7 +1093,7 @@ public Table getTable(String catalogName, String dbName, String tblName) {
                 "  `year` int(11) DEFAULT NULL,\n" +
                 "  `dt` int(11) DEFAULT NULL\n" +
                 ")\n" +
-                "PARTITION BY ( year, dt )\n" +
+                "PARTITION BY (year, dt)\n" +
                 "PROPERTIES (\"location\" = \"hdfs://hadoop/hive/warehouse/test.db/test\");", resultSet.getResultRows().get(0).get(1));
     }
 

test/sql/test_iceberg/R/test_iceberg_show_stmt

@@ -0,0 +1,21 @@
+-- name: test_iceberg_show_stmt
+create external catalog iceberg_sql_test_${uuid0} PROPERTIES ("type"="iceberg", "iceberg.catalog.type"="hive", "iceberg.catalog.hive.metastore.uris"="${iceberg_catalog_hive_metastore_uris}","enable_iceberg_metadata_cache"="true","aws.s3.access_key" = "${oss_ak}","aws.s3.secret_key" = "${oss_sk}","aws.s3.endpoint" = "${oss_endpoint}");
+-- result:
+-- !result
+show create table iceberg_sql_test_${uuid0}.iceberg_ci_db.partition_transform_table;
+-- result:
+partition_transform_table	CREATE TABLE `partition_transform_table` (
+  `k1` int(11) DEFAULT NULL,
+  `t1` datetime DEFAULT NULL,
+  `t2` datetime DEFAULT NULL,
+  `t3` datetime DEFAULT NULL,
+  `t4` datetime DEFAULT NULL,
+  `p1` varchar(1073741824) DEFAULT NULL,
+  `p2` varchar(1073741824) DEFAULT NULL
+)
+PARTITION BY (year(t1), month(t2), day(t3), hour(t4), truncate(p1, 5), bucket(p2, 3))
+PROPERTIES ("location" = "oss://starrocks-ci-test/iceberg_ci_db/partition_transform_table");
+-- !result
+drop catalog iceberg_sql_test_${uuid0};
+-- result:
+-- !result

test/sql/test_iceberg/T/test_iceberg_show_stmt

@@ -0,0 +1,7 @@
+-- name: test_iceberg_show_stmt
+
+create external catalog iceberg_sql_test_${uuid0} PROPERTIES ("type"="iceberg", "iceberg.catalog.type"="hive", "iceberg.catalog.hive.metastore.uris"="${iceberg_catalog_hive_metastore_uris}","enable_iceberg_metadata_cache"="true","aws.s3.access_key" = "${oss_ak}","aws.s3.secret_key" = "${oss_sk}","aws.s3.endpoint" = "${oss_endpoint}");
+
+show create table iceberg_sql_test_${uuid0}.iceberg_ci_db.partition_transform_table;
+
+drop catalog iceberg_sql_test_${uuid0};