From 6bd4044a2b29ac284b419ae8fc5cc61578827b05 Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Wed, 12 Jan 2022 17:21:50 +0900 Subject: [PATCH] Remove unused code for LIMIT in BigQuery connector --- .../plugin/bigquery/BigQueryMetadata.java | 19 ------------ .../plugin/bigquery/BigQueryTableHandle.java | 30 ++++--------------- 2 files changed, 6 insertions(+), 43 deletions(-) diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java index 1fe875493648..ed5218d0ed8d 100644 --- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java +++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java @@ -43,7 +43,6 @@ import io.trino.spi.connector.Constraint; import io.trino.spi.connector.ConstraintApplicationResult; import io.trino.spi.connector.InMemoryRecordSet; -import io.trino.spi.connector.LimitApplicationResult; import io.trino.spi.connector.ProjectionApplicationResult; import io.trino.spi.connector.RecordCursor; import io.trino.spi.connector.SchemaNotFoundException; @@ -396,24 +395,6 @@ public void dropTable(ConnectorSession session, ConnectorTableHandle tableHandle client.dropTable(tableId); } - @Override - public Optional> applyLimit( - ConnectorSession session, - ConnectorTableHandle handle, - long limit) - { - log.debug("applyLimit(session=%s, handle=%s, limit=%s)", session, handle, limit); - BigQueryTableHandle bigQueryTableHandle = (BigQueryTableHandle) handle; - - if (bigQueryTableHandle.getLimit().isPresent() && bigQueryTableHandle.getLimit().getAsLong() <= limit) { - return Optional.empty(); - } - - bigQueryTableHandle = bigQueryTableHandle.withLimit(limit); - - return Optional.of(new LimitApplicationResult<>(bigQueryTableHandle, false, false)); - } - @Override public Optional> applyProjection( ConnectorSession session, diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTableHandle.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTableHandle.java index d0020ea543a4..80c12399d801 100644 --- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTableHandle.java +++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryTableHandle.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.OptionalLong; import static com.google.common.base.MoreObjects.toStringHelper; import static java.util.Objects.requireNonNull; @@ -37,7 +36,6 @@ public class BigQueryTableHandle private final String type; private final TupleDomain constraint; private final Optional> projectedColumns; - private final OptionalLong limit; @JsonCreator public BigQueryTableHandle( @@ -45,15 +43,13 @@ public BigQueryTableHandle( @JsonProperty("remoteTableName") RemoteTableName remoteTableName, @JsonProperty("type") String type, @JsonProperty("constraint") TupleDomain constraint, - @JsonProperty("projectedColumns") Optional> projectedColumns, - @JsonProperty("limit") OptionalLong limit) + @JsonProperty("projectedColumns") Optional> projectedColumns) { this.schemaTableName = requireNonNull(schemaTableName, "schemaTableName is null"); this.remoteTableName = requireNonNull(remoteTableName, "remoteTableName is null"); this.type = requireNonNull(type, "type is null"); this.constraint = requireNonNull(constraint, "constraint is null"); this.projectedColumns = requireNonNull(projectedColumns, "projectedColumns is null"); - this.limit = requireNonNull(limit, "limit is null"); } public BigQueryTableHandle(SchemaTableName schemaTableName, RemoteTableName remoteTableName, TableInfo tableInfo) @@ -63,8 +59,7 @@ public BigQueryTableHandle(SchemaTableName schemaTableName, RemoteTableName remo remoteTableName, tableInfo.getDefinition().getType().toString(), TupleDomain.all(), - Optional.empty(), - OptionalLong.empty()); + Optional.empty()); } @JsonProperty @@ -97,12 +92,6 @@ public Optional> getProjectedColumns() return projectedColumns; } - @JsonProperty - public OptionalLong getLimit() - { - return limit; - } - @Override public boolean equals(Object o) { @@ -118,14 +107,13 @@ public boolean equals(Object o) return Objects.equals(schemaTableName, that.schemaTableName) && Objects.equals(type, that.type) && Objects.equals(constraint, that.constraint) && - Objects.equals(projectedColumns, that.projectedColumns) && - Objects.equals(limit, that.limit); + Objects.equals(projectedColumns, that.projectedColumns); } @Override public int hashCode() { - return Objects.hash(schemaTableName, type, constraint, projectedColumns, limit); + return Objects.hash(schemaTableName, type, constraint, projectedColumns); } @Override @@ -137,22 +125,16 @@ public String toString() .add("type", type) .add("constraint", constraint) .add("projectedColumns", projectedColumns) - .add("limit", limit) .toString(); } BigQueryTableHandle withConstraint(TupleDomain newConstraint) { - return new BigQueryTableHandle(schemaTableName, remoteTableName, type, newConstraint, projectedColumns, limit); + return new BigQueryTableHandle(schemaTableName, remoteTableName, type, newConstraint, projectedColumns); } BigQueryTableHandle withProjectedColumns(List newProjectedColumns) { - return new BigQueryTableHandle(schemaTableName, remoteTableName, type, constraint, Optional.of(newProjectedColumns), limit); - } - - BigQueryTableHandle withLimit(long newLimit) - { - return new BigQueryTableHandle(schemaTableName, remoteTableName, type, constraint, projectedColumns, OptionalLong.of(newLimit)); + return new BigQueryTableHandle(schemaTableName, remoteTableName, type, constraint, Optional.of(newProjectedColumns)); } }