diff --git a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java index 6b24e9bbda076..cc0a8c3a9de5a 100644 --- a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java +++ b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java @@ -208,7 +208,6 @@ import static com.facebook.presto.spi.analyzer.AccessControlRole.TABLE_CREATE; import static com.facebook.presto.spi.analyzer.AccessControlRole.TABLE_DELETE; import static com.facebook.presto.spi.analyzer.AccessControlRole.TABLE_INSERT; -import static com.facebook.presto.spi.connector.ConnectorTableVersion.VersionOperator; import static com.facebook.presto.spi.connector.ConnectorTableVersion.VersionType; import static com.facebook.presto.spi.function.FunctionKind.AGGREGATE; import static com.facebook.presto.spi.function.FunctionKind.WINDOW; @@ -280,7 +279,6 @@ import static com.facebook.presto.sql.tree.FrameBound.Type.UNBOUNDED_FOLLOWING; import static com.facebook.presto.sql.tree.FrameBound.Type.UNBOUNDED_PRECEDING; import static com.facebook.presto.sql.tree.TableVersionExpression.TableVersionOperator; -import static com.facebook.presto.sql.tree.TableVersionExpression.TableVersionOperator.EQUAL; import static com.facebook.presto.sql.tree.TableVersionExpression.TableVersionOperator.LESS_THAN; import static com.facebook.presto.sql.tree.TableVersionExpression.TableVersionType; import static com.facebook.presto.sql.tree.TableVersionExpression.TableVersionType.TIMESTAMP; @@ -1368,17 +1366,6 @@ private Optional getTableHandle(TableColumnMetadata tableColumnsMet } } - private VersionOperator toVersionOperator(TableVersionOperator operator) - { - switch (operator) { - case EQUAL: - return VersionOperator.EQUAL; - case LESS_THAN: - return VersionOperator.LESS_THAN; - } - throw new SemanticException(NOT_SUPPORTED, "Table version operator %s not supported." + operator); - } - private VersionType toVersionType(TableVersionType type) { switch (type) { @@ -1419,7 +1406,7 @@ private Optional processTableVersion(Table table, QualifiedObjectNa } } - ConnectorTableVersion tableVersion = new ConnectorTableVersion(toVersionType(tableVersionType), toVersionOperator(tableVersionOperator), stateExprType, evalStateExpr); + ConnectorTableVersion tableVersion = new ConnectorTableVersion(toVersionType(tableVersionType), stateExprType, evalStateExpr); return metadata.getHandleVersion(session, name, Optional.of(tableVersion)); } diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/connector/ConnectorTableVersion.java b/presto-spi/src/main/java/com/facebook/presto/spi/connector/ConnectorTableVersion.java index 86a07467b1dec..c15d272eee78e 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/connector/ConnectorTableVersion.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/connector/ConnectorTableVersion.java @@ -24,24 +24,17 @@ public enum VersionType TIMESTAMP, VERSION } - public enum VersionOperator - { - EQUAL, - LESS_THAN - } + private final VersionType versionType; - private final VersionOperator versionOperator; private final Type versionExpressionType; private final Object tableVersion; - public ConnectorTableVersion(VersionType versionType, VersionOperator versionOperator, Type versionExpressionType, Object tableVersion) + public ConnectorTableVersion(VersionType versionType, Type versionExpressionType, Object tableVersion) { requireNonNull(versionType, "versionType is null"); - requireNonNull(versionOperator, "versionOperator is null"); requireNonNull(versionExpressionType, "versionExpressionType is null"); requireNonNull(tableVersion, "tableVersion is null"); this.versionType = versionType; - this.versionOperator = versionOperator; this.versionExpressionType = versionExpressionType; this.tableVersion = tableVersion; }