Skip to content

Make version OptionalInt in AbstractIcebergTableOperations #14938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebyhr merged 1 commit into from
Nov 10, 2022
Merged

Make version OptionalInt in AbstractIcebergTableOperations #14938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions ...iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractIcebergTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.OptionalInt;
import java.util.concurrent.atomic.AtomicReference;

import static com.google.common.base.Preconditions.checkState;
Expand Down Expand Up @@ -73,7 +74,7 @@ public abstract class AbstractIcebergTableOperations
protected TableMetadata currentMetadata;
protected String currentMetadataLocation;
protected boolean shouldRefresh = true;
protected int version = -1;
protected OptionalInt version = OptionalInt.empty();

protected AbstractIcebergTableOperations(
FileIO fileIo,
Expand All @@ -98,7 +99,7 @@ public void initializeFromMetadata(TableMetadata tableMetadata)
currentMetadata = tableMetadata;
currentMetadataLocation = tableMetadata.metadataFileLocation();
shouldRefresh = false;
version = parseVersion(currentMetadataLocation).orElse(-1);
version = parseVersion(currentMetadataLocation);
}

@Override
Expand Down Expand Up @@ -228,7 +229,7 @@ protected void refreshFromMetadataLocation(String newLocation)

currentMetadata = newMetadata.get();
currentMetadataLocation = newLocation;
version = parseVersion(newLocation).orElse(-1);
version = parseVersion(newLocation);
shouldRefresh = false;
}

Expand Down
2 changes: 1 addition & 1 deletion ...berg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
currentMetadataLocation, metadataLocation, getSchemaTableName());
}

String newMetadataLocation = writeNewMetadata(metadata, version + 1);
String newMetadataLocation = writeNewMetadata(metadata, version.orElseThrow() + 1);

Table table = Table.builder(currentTable)
.setDataColumns(toHiveColumns(metadata.schema().columns()))
Expand Down
4 changes: 2 additions & 2 deletions ...ceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ protected String getRefreshedLocation(boolean invalidateCaches)
@Override
protected void commitNewTable(TableMetadata metadata)
{
verify(version == -1, "commitNewTable called on a table which already exists");
verify(version.isEmpty(), "commitNewTable called on a table which already exists");
String newMetadataLocation = writeNewMetadata(metadata, 0);
TableInput tableInput = getTableInput(tableName, owner, ImmutableMap.of(METADATA_LOCATION_PROP, newMetadataLocation));

Expand All @@ -115,7 +115,7 @@ protected void commitNewTable(TableMetadata metadata)
@Override
protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
{
String newMetadataLocation = writeNewMetadata(metadata, version + 1);
String newMetadataLocation = writeNewMetadata(metadata, version.orElseThrow() + 1);
TableInput tableInput = getTableInput(
tableName,
owner,
Expand Down
4 changes: 3 additions & 1 deletion ...g/src/main/java/io/trino/plugin/iceberg/catalog/hms/AbstractMetastoreTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

import java.util.Optional;

import static com.google.common.base.Verify.verify;
import static io.trino.plugin.hive.HiveMetadata.TABLE_COMMENT;
import static io.trino.plugin.hive.ViewReaderUtil.isHiveOrPrestoView;
import static io.trino.plugin.hive.ViewReaderUtil.isPrestoView;
Expand Down Expand Up @@ -89,7 +90,8 @@ protected final String getRefreshedLocation(boolean invalidateCaches)
@Override
protected final void commitNewTable(TableMetadata metadata)
{
String newMetadataLocation = writeNewMetadata(metadata, version + 1);
verify(version.isEmpty(), "commitNewTable called on a table which already exists");
String newMetadataLocation = writeNewMetadata(metadata, 0);

Table.Builder builder = Table.builder()
.setDatabaseName(database)
Expand Down
2 changes: 1 addition & 1 deletion ...eberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public HiveMetastoreTableOperations(
@Override
protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
{
String newMetadataLocation = writeNewMetadata(metadata, version + 1);
String newMetadataLocation = writeNewMetadata(metadata, version.orElseThrow() + 1);

long lockId = thriftMetastore.acquireTableExclusiveLock(
new AcidTransactionOwner(session.getUser()),
Expand Down