recombine iceberg tablehandle and deletetablehandle, fix serialization

prestodb · Feb 12, 2025 · 2e9f2cd · 2e9f2cd
1 parent a69a5a0
commit 2e9f2cd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 169 deletions.
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
@@ -860,40 +860,29 @@ public void truncateTable(ConnectorSession session, ConnectorTableHandle tableHa
     public ConnectorDeleteTableHandle beginDelete(ConnectorSession session, ConnectorTableHandle tableHandle)
     {
         IcebergTableHandle handle = (IcebergTableHandle) tableHandle;
-        IcebergDeleteTableHandle deleteHandle = new IcebergDeleteTableHandle(
-                handle.getSchemaName(),
-                handle.getIcebergTableName(),
-                handle.isSnapshotSpecified(),
-                handle.getOutputPath(),
-                handle.getStorageProperties(),
-                handle.getTableSchemaJson(),
-                handle.getPartitionSpecId(),
-                handle.getEqualityFieldIds());
-        Table icebergTable = getIcebergTable(session, deleteHandle.getSchemaTableName());
-
-        if (deleteHandle.isSnapshotSpecified()) {
+        Table icebergTable = getIcebergTable(session, handle.getSchemaTableName());
+
+        if (handle.isSnapshotSpecified()) {
             throw new PrestoException(NOT_SUPPORTED, "This connector do not allow delete data at specified snapshot");
         }
 
         int formatVersion = ((BaseTable) icebergTable).operations().current().formatVersion();
         if (formatVersion < MIN_FORMAT_VERSION_FOR_DELETE) {
             throw new PrestoException(NOT_SUPPORTED, format("This connector only supports delete where one or more partitions are deleted entirely for table versions older than %d", MIN_FORMAT_VERSION_FOR_DELETE));
         }
-
         if (getDeleteMode(icebergTable) == RowLevelOperationMode.COPY_ON_WRITE) {
             throw new PrestoException(NOT_SUPPORTED, "This connector only supports delete where one or more partitions are deleted entirely. Configure delete_mode table property to allow row level deletions.");
         }
-
         validateTableMode(session, icebergTable);
         transaction = icebergTable.newTransaction();
 
-        return deleteHandle;
+        return handle;
     }
 
     @Override
     public void finishDelete(ConnectorSession session, ConnectorDeleteTableHandle tableHandle, Collection<Slice> fragments)
     {
-        IcebergDeleteTableHandle handle = (IcebergDeleteTableHandle) tableHandle;
+        IcebergTableHandle handle = (IcebergTableHandle) tableHandle;
         Table icebergTable = getIcebergTable(session, handle.getSchemaTableName());
 
         RowDelta rowDelta = transaction.newRowDelta();

diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergDeleteTableHandle.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergDeleteTableHandle.java
diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHandleResolver.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHandleResolver.java
@@ -66,7 +66,7 @@ public Class<? extends ConnectorInsertTableHandle> getInsertTableHandleClass()
     @Override
     public Class<? extends ConnectorDeleteTableHandle> getDeleteTableHandleClass()
     {
-        return IcebergDeleteTableHandle.class;
+        return IcebergTableHandle.class;
     }
 
     @Override

diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergTableHandle.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergTableHandle.java
@@ -14,6 +14,7 @@
 package com.facebook.presto.iceberg;
 
 import com.facebook.presto.hive.BaseHiveTableHandle;
+import com.facebook.presto.spi.ConnectorDeleteTableHandle;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -26,6 +27,7 @@
 
 public class IcebergTableHandle
         extends BaseHiveTableHandle
+            implements ConnectorDeleteTableHandle
 {
     private final IcebergTableName icebergTableName;
     private final boolean snapshotSpecified;

diff --git a/presto-main/src/main/java/com/facebook/presto/metadata/HandleResolver.java b/presto-main/src/main/java/com/facebook/presto/metadata/HandleResolver.java
@@ -225,7 +225,7 @@ private <T> String getId(T handle, Function<MaterializedHandleResolver, Optional
             catch (UnsupportedOperationException ignored) {
             }
         }
-        throw new IllegalArgumentException("No connector for handle: " + handle);
+        throw new IllegalArgumentException("No connector for handle: " + handle + " of type " + handle.getClass());
     }
 
     private <T> String getFunctionNamespaceId(T handle, Function<MaterializedFunctionHandleResolver, Optional<Class<? extends T>>> getter)