Skip to content

Remove redundant format version change in TestIcebergV2 #24964

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
Feb 10, 2025
Merged

Remove redundant format version change in TestIcebergV2 #24964

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
6 changes: 4 additions & 2 deletions plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.common.collect.Iterables.getOnlyElement;
Expand Down Expand Up @@ -1188,7 +1189,7 @@ public void testNestedFieldPartitioning()
assertThat(loadTable(tableName).newScan().planFiles()).hasSize(4);

assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES partitioning = ARRAY['\"state.name\"', '\"district.name\"']");
Table icebergTable = updateTableToV2(tableName);
Table icebergTable = loadTable(tableName);
assertThat(icebergTable.spec().fields().stream().map(PartitionField::name).toList())
.containsExactlyInAnyOrder("state.name", "district.name");

Expand Down Expand Up @@ -1246,7 +1247,7 @@ public void testHighlyNestedFieldPartitioning()
assertThat(loadTable(tableName).newScan().planFiles()).hasSize(2);

assertUpdate("ALTER TABLE " + tableName + " SET PROPERTIES partitioning = ARRAY['\"country.state.district.name\"', '\"country.state.name\"']");
Table icebergTable = updateTableToV2(tableName);
Table icebergTable = loadTable(tableName);
assertThat(icebergTable.spec().fields().stream().map(PartitionField::name).toList())
.containsExactlyInAnyOrder("country.state.district.name", "country.state.name");

Expand Down Expand Up @@ -1537,6 +1538,7 @@ private Table updateTableToV2(String tableName)
BaseTable table = loadTable(tableName);
TableOperations operations = table.operations();
TableMetadata currentMetadata = operations.current();
checkArgument(currentMetadata.formatVersion() != 2, "Format version is already 2: '%s'", tableName);
operations.commit(currentMetadata, currentMetadata.upgradeToFormatVersion(2));

return table;
Expand Down