Disable timestamp with time zone type on create & alter table for ice…

…berg tables.
prestodb · Oct 26, 2023 · 9bce03a · 9bce03a
1 parent a00fdc6
commit 9bce03a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/ColumnIdentity.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/ColumnIdentity.java
@@ -125,6 +125,10 @@ public static ColumnIdentity createColumnIdentity(Types.NestedField column)
         String name = column.name();
         org.apache.iceberg.types.Type fieldType = column.type();
 
+        if (fieldType.equals(Types.TimestampType.withZone())) {
+            throw new UnsupportedOperationException(format("Iceberg column type %s is not supported", fieldType));
+        }
+
         if (!fieldType.isNestedType()) {
             return new ColumnIdentity(id, name, PRIMITIVE, ImmutableList.of());
         }

diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergAbstractMetadata.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergAbstractMetadata.java
@@ -351,9 +351,16 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
         if (!column.isNullable()) {
             throw new PrestoException(NOT_SUPPORTED, "This connector does not support add column with non null");
         }
+
+        org.apache.iceberg.types.Type columnType = toIcebergType(column.getType());
+
+        if (columnType.equals(Types.TimestampType.withZone())) {
+            throw new PrestoException(NOT_SUPPORTED, format("Iceberg column type %s is not supported", columnType));
+        }
+
         IcebergTableHandle handle = (IcebergTableHandle) tableHandle;
         Table icebergTable = getIcebergTable(session, handle.getSchemaTableName());
-        icebergTable.updateSchema().addColumn(column.getName(), toIcebergType(column.getType()), column.getComment()).commit();
+        icebergTable.updateSchema().addColumn(column.getName(), columnType, column.getComment()).commit();
     }
 
     @Override

diff --git a/...to-iceberg/src/test/java/com/facebook/presto/iceberg/IcebergDistributedSmokeTestBase.java b/...to-iceberg/src/test/java/com/facebook/presto/iceberg/IcebergDistributedSmokeTestBase.java
@@ -76,6 +76,15 @@ public void testTimestamp()
         dropTable(getSession(), "test_timestamp");
     }
 
+    @Test
+    public void testTimestampWithTimeZone()
+    {
+        assertQueryFails("CREATE TABLE test_timestamp_with_timezone (x timestamp with time zone)", "Iceberg column type timestamptz is not supported");
+        assertUpdate("CREATE TABLE test_timestamp_with_timezone (x timestamp)");
+        assertQueryFails("ALTER TABLE test_timestamp_with_timezone ADD COLUMN y timestamp with time zone", "Iceberg column type timestamptz is not supported");
+        dropTable(getSession(), "test_timestamp_with_timezone");
+    }
+
     @Test
     @Override
     public void testDescribeTable()