Remove TableLayoutHandle for Tpch connector

SipeiZhou · Jan 13, 2022 · 99d9027 · 99d9027
1 parent 1bb3e84
commit 99d9027
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 90 deletions.
diff --git a/core/trino-main/src/test/java/io/trino/cost/TestCostCalculator.java b/core/trino-main/src/test/java/io/trino/cost/TestCostCalculator.java
@@ -26,7 +26,6 @@
 import io.trino.plugin.tpch.TpchColumnHandle;
 import io.trino.plugin.tpch.TpchConnectorFactory;
 import io.trino.plugin.tpch.TpchTableHandle;
-import io.trino.plugin.tpch.TpchTableLayoutHandle;
 import io.trino.security.AllowAllAccessControl;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.predicate.TupleDomain;
@@ -794,7 +793,7 @@ private TableScanNode tableScan(String id, String... symbols)
         TpchTableHandle tableHandle = new TpchTableHandle("sf1", "orders", 1.0);
         return new TableScanNode(
                 new PlanNodeId(id),
-                new TableHandle(new CatalogName("tpch"), tableHandle, INSTANCE, Optional.of(new TpchTableLayoutHandle(tableHandle, TupleDomain.all()))),
+                new TableHandle(new CatalogName("tpch"), tableHandle, INSTANCE, Optional.empty()),
                 symbolsList,
                 assignments.build(),
                 TupleDomain.all(),

diff --git a/...ain/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateIntoTableScan.java b/...ain/src/test/java/io/trino/sql/planner/iterative/rule/TestPushPredicateIntoTableScan.java
@@ -25,7 +25,6 @@
 import io.trino.metadata.TestingFunctionResolution;
 import io.trino.plugin.tpch.TpchColumnHandle;
 import io.trino.plugin.tpch.TpchTableHandle;
-import io.trino.plugin.tpch.TpchTableLayoutHandle;
 import io.trino.plugin.tpch.TpchTransactionHandle;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ConnectorPartitioningHandle;
@@ -104,14 +103,14 @@ public void setUpBeforeClass()
                 catalogName,
                 nation,
                 TpchTransactionHandle.INSTANCE,
-                Optional.of(new TpchTableLayoutHandle(nation, TupleDomain.all())));
+                Optional.empty());
 
         TpchTableHandle orders = new TpchTableHandle("sf1", "orders", 1.0);
         ordersTableHandle = new TableHandle(
                 catalogName,
                 orders,
                 TpchTransactionHandle.INSTANCE,
-                Optional.of(new TpchTableLayoutHandle(orders, TupleDomain.all())));
+                Optional.empty());
     }
 
     @Test

diff --git a/.../test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantTableScanPredicate.java b/.../test/java/io/trino/sql/planner/iterative/rule/TestRemoveRedundantTableScanPredicate.java
@@ -19,7 +19,6 @@
 import io.trino.metadata.TableHandle;
 import io.trino.plugin.tpch.TpchColumnHandle;
 import io.trino.plugin.tpch.TpchTableHandle;
-import io.trino.plugin.tpch.TpchTableLayoutHandle;
 import io.trino.plugin.tpch.TpchTransactionHandle;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.predicate.Domain;
@@ -65,14 +64,14 @@ public void setUpBeforeClass()
                 catalogName,
                 nation,
                 TpchTransactionHandle.INSTANCE,
-                Optional.of(new TpchTableLayoutHandle(nation, TupleDomain.all())));
+                Optional.empty());
 
         TpchTableHandle orders = new TpchTableHandle("sf1", "orders", 1.0);
         ordersTableHandle = new TableHandle(
                 catalogName,
                 orders,
                 TpchTransactionHandle.INSTANCE,
-                Optional.of(new TpchTableLayoutHandle(orders, TupleDomain.all())));
+                Optional.empty());
     }
 
     @Test

diff --git a/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchHandleResolver.java b/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchHandleResolver.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;
 
 public class TpchHandleResolver
@@ -42,12 +41,6 @@ public Class<? extends ConnectorSplit> getSplitClass()
         return TpchSplit.class;
     }
 
-    @Override
-    public Class<? extends ConnectorTableLayoutHandle> getTableLayoutHandleClass()
-    {
-        return TpchTableLayoutHandle.class;
-    }
-
     @Override
     public Class<? extends ConnectorTransactionHandle> getTransactionHandleClass()
     {

diff --git a/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchTableLayoutHandle.java b/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchTableLayoutHandle.java