From 58ac90609fb258f3b5a411fa5415cbda5101d8c7 Mon Sep 17 00:00:00 2001 From: Yi He Date: Wed, 27 Mar 2019 12:35:37 -0700 Subject: [PATCH] Remove TableLayoutHandle completely --- .../presto/metadata/TableLayoutHandle.java | 85 ------------------- .../TestEffectivePredicateExtractor.java | 6 -- .../TestValidateStreamingAggregations.java | 6 -- 3 files changed, 97 deletions(-) delete mode 100644 presto-main/src/main/java/com/facebook/presto/metadata/TableLayoutHandle.java diff --git a/presto-main/src/main/java/com/facebook/presto/metadata/TableLayoutHandle.java b/presto-main/src/main/java/com/facebook/presto/metadata/TableLayoutHandle.java deleted file mode 100644 index 64a8344926598..0000000000000 --- a/presto-main/src/main/java/com/facebook/presto/metadata/TableLayoutHandle.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.facebook.presto.metadata; - -import com.facebook.presto.connector.ConnectorId; -import com.facebook.presto.spi.ConnectorTableLayoutHandle; -import com.facebook.presto.spi.connector.ConnectorTransactionHandle; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.Objects; - -import static java.util.Objects.requireNonNull; - -public final class TableLayoutHandle -{ - private final ConnectorId connectorId; - private final ConnectorTransactionHandle transactionHandle; - private final ConnectorTableLayoutHandle layout; - - @JsonCreator - public TableLayoutHandle( - @JsonProperty("connectorId") ConnectorId connectorId, - @JsonProperty("transactionHandle") ConnectorTransactionHandle transactionHandle, - @JsonProperty("connectorHandle") ConnectorTableLayoutHandle layout) - { - requireNonNull(connectorId, "connectorId is null"); - requireNonNull(transactionHandle, "transactionHandle is null"); - requireNonNull(layout, "layout is null"); - - this.connectorId = connectorId; - this.transactionHandle = transactionHandle; - this.layout = layout; - } - - @JsonProperty - public ConnectorId getConnectorId() - { - return connectorId; - } - - @JsonProperty - public ConnectorTransactionHandle getTransactionHandle() - { - return transactionHandle; - } - - @JsonProperty - public ConnectorTableLayoutHandle getConnectorHandle() - { - return layout; - } - - @Override - public boolean equals(Object o) - { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - TableLayoutHandle that = (TableLayoutHandle) o; - return Objects.equals(connectorId, that.connectorId) && - Objects.equals(transactionHandle, that.transactionHandle) && - Objects.equals(layout, that.layout); - } - - @Override - public int hashCode() - { - return Objects.hash(connectorId, transactionHandle, layout); - } -} diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java index 03a3ee1b8f277..296620e5c0038 100644 --- a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java +++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java @@ -17,7 +17,6 @@ import com.facebook.presto.metadata.Metadata; import com.facebook.presto.metadata.MetadataManager; import com.facebook.presto.metadata.TableHandle; -import com.facebook.presto.metadata.TableLayoutHandle; import com.facebook.presto.spi.ColumnHandle; import com.facebook.presto.spi.block.SortOrder; import com.facebook.presto.spi.function.FunctionHandle; @@ -98,11 +97,6 @@ public class TestEffectivePredicateExtractor TestingTransactionHandle.create(), Optional.of(TestingHandle.INSTANCE)); - private static final TableLayoutHandle TESTING_TABLE_LAYOUT = new TableLayoutHandle( - new ConnectorId("x"), - TestingTransactionHandle.create(), - TestingHandle.INSTANCE); - private static final Symbol A = new Symbol("a"); private static final Symbol B = new Symbol("b"); private static final Symbol C = new Symbol("c"); diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/sanity/TestValidateStreamingAggregations.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/sanity/TestValidateStreamingAggregations.java index 62d2af162a2fd..8f081949de812 100644 --- a/presto-main/src/test/java/com/facebook/presto/sql/planner/sanity/TestValidateStreamingAggregations.java +++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/sanity/TestValidateStreamingAggregations.java @@ -17,7 +17,6 @@ import com.facebook.presto.execution.warnings.WarningCollector; import com.facebook.presto.metadata.Metadata; import com.facebook.presto.metadata.TableHandle; -import com.facebook.presto.metadata.TableLayoutHandle; import com.facebook.presto.spi.predicate.TupleDomain; import com.facebook.presto.sql.parser.SqlParser; import com.facebook.presto.sql.planner.PlanNodeIdAllocator; @@ -47,7 +46,6 @@ public class TestValidateStreamingAggregations private SqlParser sqlParser; private PlanNodeIdAllocator idAllocator = new PlanNodeIdAllocator(); private TableHandle nationTableHandle; - private TableLayoutHandle nationTableLayoutHandle; @BeforeClass public void setup() @@ -62,10 +60,6 @@ public void setup() nationTpchTableHandle, TestingTransactionHandle.create(), Optional.of(new TpchTableLayoutHandle(nationTpchTableHandle, TupleDomain.all()))); - - nationTableLayoutHandle = new TableLayoutHandle(connectorId, - TestingTransactionHandle.create(), - new TpchTableLayoutHandle((TpchTableHandle) nationTableHandle.getConnectorHandle(), TupleDomain.all())); } @Test