Remove ConnectorTableLayoutHandle

SipeiZhou · Jan 13, 2022 · 4ae0419 · 4ae0419
1 parent eb32a25
commit 4ae0419
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 69 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/metadata/HandleJsonModule.java b/core/trino-main/src/main/java/io/trino/metadata/HandleJsonModule.java
@@ -25,7 +25,6 @@
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorTableExecuteHandle;
 import io.trino.spi.connector.ConnectorTableHandle;
-import io.trino.spi.connector.ConnectorTableLayoutHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
 public class HandleJsonModule
@@ -43,12 +42,6 @@ public static com.fasterxml.jackson.databind.Module tableHandleModule(HandleReso
         return new AbstractTypedJacksonModule<>(ConnectorTableHandle.class, resolver::getId, resolver::getTableHandleClass) {};
     }
 
-    @ProvidesIntoSet
-    public static com.fasterxml.jackson.databind.Module tableLayoutHandleModule(HandleResolver resolver)
-    {
-        return new AbstractTypedJacksonModule<>(ConnectorTableLayoutHandle.class, resolver::getId, resolver::getTableLayoutHandleClass) {};
-    }
-
     @ProvidesIntoSet
     public static com.fasterxml.jackson.databind.Module columnHandleModule(HandleResolver resolver)
     {

diff --git a/core/trino-main/src/main/java/io/trino/metadata/HandleResolver.java b/core/trino-main/src/main/java/io/trino/metadata/HandleResolver.java
@@ -24,7 +24,6 @@
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorTableExecuteHandle;
 import io.trino.spi.connector.ConnectorTableHandle;
-import io.trino.spi.connector.ConnectorTableLayoutHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.split.EmptySplitHandleResolver;
 
@@ -74,11 +73,6 @@ public String getId(ConnectorTableHandle tableHandle)
         return getId(tableHandle, MaterializedHandleResolver::getTableHandleClass);
     }
 
-    public String getId(ConnectorTableLayoutHandle handle)
-    {
-        return getId(handle, MaterializedHandleResolver::getTableLayoutHandleClass);
-    }
-
     public String getId(ColumnHandle columnHandle)
     {
         return getId(columnHandle, MaterializedHandleResolver::getColumnHandleClass);
@@ -124,11 +118,6 @@ public Class<? extends ConnectorTableHandle> getTableHandleClass(String id)
         return resolverFor(id).getTableHandleClass().orElseThrow(() -> new IllegalArgumentException("No resolver for " + id));
     }
 
-    public Class<? extends ConnectorTableLayoutHandle> getTableLayoutHandleClass(String id)
-    {
-        return resolverFor(id).getTableLayoutHandleClass().orElseThrow(() -> new IllegalArgumentException("No resolver for " + id));
-    }
-
     public Class<? extends ColumnHandle> getColumnHandleClass(String id)
     {
         return resolverFor(id).getColumnHandleClass().orElseThrow(() -> new IllegalArgumentException("No resolver for " + id));
@@ -193,7 +182,6 @@ private <T> String getId(T handle, Function<MaterializedHandleResolver, Optional
     private static class MaterializedHandleResolver
     {
         private final Optional<Class<? extends ConnectorTableHandle>> tableHandle;
-        private final Optional<Class<? extends ConnectorTableLayoutHandle>> layoutHandle;
         private final Optional<Class<? extends ColumnHandle>> columnHandle;
         private final Optional<Class<? extends ConnectorSplit>> split;
         private final Optional<Class<? extends ConnectorIndexHandle>> indexHandle;
@@ -206,7 +194,6 @@ private static class MaterializedHandleResolver
         public MaterializedHandleResolver(ConnectorHandleResolver resolver)
         {
             tableHandle = getHandleClass(resolver::getTableHandleClass);
-            layoutHandle = getHandleClass(resolver::getTableLayoutHandleClass);
             columnHandle = getHandleClass(resolver::getColumnHandleClass);
             split = getHandleClass(resolver::getSplitClass);
             indexHandle = getHandleClass(resolver::getIndexHandleClass);
@@ -232,11 +219,6 @@ public Optional<Class<? extends ConnectorTableHandle>> getTableHandleClass()
             return tableHandle;
         }
 
-        public Optional<Class<? extends ConnectorTableLayoutHandle>> getTableLayoutHandleClass()
-        {
-            return layoutHandle;
-        }
-
         public Optional<Class<? extends ColumnHandle>> getColumnHandleClass()
         {
             return columnHandle;
@@ -288,7 +270,6 @@ public boolean equals(Object o)
             }
             MaterializedHandleResolver that = (MaterializedHandleResolver) o;
             return Objects.equals(tableHandle, that.tableHandle) &&
-                    Objects.equals(layoutHandle, that.layoutHandle) &&
                     Objects.equals(columnHandle, that.columnHandle) &&
                     Objects.equals(split, that.split) &&
                     Objects.equals(indexHandle, that.indexHandle) &&
@@ -302,7 +283,7 @@ public boolean equals(Object o)
         @Override
         public int hashCode()
         {
-            return Objects.hash(tableHandle, layoutHandle, columnHandle, split, indexHandle, outputTableHandle, insertTableHandle, tableExecuteHandle, partitioningHandle, transactionHandle);
+            return Objects.hash(tableHandle, columnHandle, split, indexHandle, outputTableHandle, insertTableHandle, tableExecuteHandle, partitioningHandle, transactionHandle);
         }
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/metadata/RemoteHandleResolver.java b/core/trino-main/src/main/java/io/trino/metadata/RemoteHandleResolver.java
@@ -18,7 +18,6 @@
 import io.trino.spi.connector.ConnectorPartitioningHandle;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorTableHandle;
-import io.trino.spi.connector.ConnectorTableLayoutHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.split.RemoteSplit;
 import io.trino.sql.planner.SystemPartitioningHandle;
@@ -32,12 +31,6 @@ public Class<? extends ConnectorTableHandle> getTableHandleClass()
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public Class<? extends ConnectorTableLayoutHandle> getTableLayoutHandleClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Class<? extends ColumnHandle> getColumnHandleClass()
     {

diff --git a/core/trino-main/src/main/java/io/trino/split/EmptySplitHandleResolver.java b/core/trino-main/src/main/java/io/trino/split/EmptySplitHandleResolver.java
@@ -17,7 +17,6 @@
 import io.trino.spi.connector.ConnectorHandleResolver;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorTableHandle;
-import io.trino.spi.connector.ConnectorTableLayoutHandle;
 
 public class EmptySplitHandleResolver
         implements ConnectorHandleResolver
@@ -28,12 +27,6 @@ public Class<? extends ConnectorTableHandle> getTableHandleClass()
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public Class<? extends ConnectorTableLayoutHandle> getTableLayoutHandleClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Class<? extends ColumnHandle> getColumnHandleClass()
     {

diff --git a/core/trino-main/src/main/java/io/trino/testing/TestingHandle.java b/core/trino-main/src/main/java/io/trino/testing/TestingHandle.java
@@ -15,10 +15,9 @@
 
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
-import io.trino.spi.connector.ConnectorTableLayoutHandle;
 
 public enum TestingHandle
-        implements ConnectorOutputTableHandle, ConnectorInsertTableHandle, ConnectorTableLayoutHandle
+        implements ConnectorOutputTableHandle, ConnectorInsertTableHandle
 {
     INSTANCE
 }
diff --git a/core/trino-main/src/main/java/io/trino/testing/TestingHandleResolver.java b/core/trino-main/src/main/java/io/trino/testing/TestingHandleResolver.java
@@ -19,7 +19,6 @@
 import io.trino.spi.connector.ConnectorOutputTableHandle;
 import io.trino.spi.connector.ConnectorSplit;
 import io.trino.spi.connector.ConnectorTableHandle;
-import io.trino.spi.connector.ConnectorTableLayoutHandle;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.testing.TestingMetadata.TestingColumnHandle;
 import io.trino.testing.TestingMetadata.TestingTableHandle;
@@ -33,12 +32,6 @@ public Class<? extends ConnectorTableHandle> getTableHandleClass()
         return TestingTableHandle.class;
     }
 
-    @Override
-    public Class<? extends ConnectorTableLayoutHandle> getTableLayoutHandleClass()
-    {
-        return TestingHandle.class;
-    }
-
     @Override
     public Class<? extends ColumnHandle> getColumnHandleClass()
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableLayoutHandle.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorTableLayoutHandle.java