Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1368,17 +1366,6 @@ private Optional<TableHandle> 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) {
Expand Down Expand Up @@ -1419,7 +1406,7 @@ private Optional<TableHandle> 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));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down