Skip to content

Fix OPTIMIZE failing with uppercase Iceberg column names #28888

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

Closed
kinolaev wants to merge 1 commit into from
+28 −18
Closed

Fix OPTIMIZE failing with uppercase Iceberg column names #28888

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
27 changes: 9 additions & 18 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2018,32 +2018,23 @@ public Set<ColumnHandle> getColumnHandlesForTableExecute(ConnectorSession sessio
IcebergTableExecuteHandle executeHandle = (IcebergTableExecuteHandle) tableExecuteHandle;
IcebergTableHandle icebergTableHandle = (IcebergTableHandle) tableHandle;
return switch (executeHandle.procedureId()) {
case OPTIMIZE -> getColumnHandlesForOptimize(session, icebergTableHandle, icebergTableHandle.getFormatVersion());
case OPTIMIZE -> getColumnHandlesForOptimize(icebergTableHandle);
case OPTIMIZE_MANIFESTS, DROP_EXTENDED_STATS, ROLLBACK_TO_SNAPSHOT, EXPIRE_SNAPSHOTS, REMOVE_ORPHAN_FILES, ADD_FILES, ADD_FILES_FROM_TABLE ->
throw new IllegalArgumentException("Unknown procedure '" + executeHandle.procedureId() + "'");
};
}

private Set<ColumnHandle> getColumnHandlesForOptimize(ConnectorSession session, IcebergTableHandle tableHandle, int formatVersion)
private Set<ColumnHandle> getColumnHandlesForOptimize(IcebergTableHandle table)
{
Map<String, ColumnHandle> columnHandles = getColumnHandles(session, tableHandle);
return getTableMetadata(session, tableHandle).getColumns().stream()
.filter(column -> isOptimizeReadColumn(formatVersion, column))
.map(ColumnMetadata::getName)
.map(columnName -> requireNonNull(columnHandles.get(columnName), "Cannot find column handle for " + columnName))
.collect(toImmutableSet());
}

private static boolean isOptimizeReadColumn(int formatVersion, ColumnMetadata column)
{
if (!column.isHidden()) {
return true;
ImmutableSet.Builder<ColumnHandle> columnHandles = ImmutableSet.builder();
for (IcebergColumnHandle columnHandle : getTopLevelColumns(SchemaParser.fromJson(table.getTableSchemaJson()), typeManager)) {
columnHandles.add(columnHandle);
}
if (formatVersion < 3) {
return false;
if (table.getFormatVersion() >= 3) {
columnHandles.add(rowIdColumnHandle());
columnHandles.add(lastUpdatedSequenceNumberColumnHandle());
}
String columnName = column.getName();
return columnName.equals(ROW_ID.getColumnName()) || columnName.equals(LAST_UPDATED_SEQUENCE_NUMBER.getColumnName());
return columnHandles.build();
}

@Override
Expand Down
19 changes: 19 additions & 0 deletions ...uct-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3065,6 +3065,25 @@ public void testTrinoAnalyzeWithNonLowercaseColumnName()
onSpark().executeQuery("DROP TABLE " + sparkTableName);
}

@Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS})
public void testTrinoOptimizeWithNonLowercaseColumnName()
{
String baseTableName = "test_trino_optimize_with_uppercase_field" + randomNameSuffix();
String trinoTableName = trinoTableName(baseTableName);
String sparkTableName = sparkTableName(baseTableName);

onSpark().executeQuery("CREATE TABLE " + sparkTableName + "(col1 INT, COL2 INT) USING ICEBERG");
onSpark().executeQuery("INSERT INTO " + sparkTableName + " VALUES (1, 1)");
onSpark().executeQuery("INSERT INTO " + sparkTableName + " VALUES (2, 2)");
onTrino().executeQuery("ALTER TABLE " + trinoTableName + " EXECUTE optimize");

List<Row> expected = ImmutableList.of(row(1, 1), row(2, 2));
assertThat(onTrino().executeQuery("SELECT * FROM " + trinoTableName)).containsOnly(expected);
assertThat(onSpark().executeQuery("SELECT * FROM " + sparkTableName)).containsOnly(expected);

onSpark().executeQuery("DROP TABLE " + sparkTableName);
}

@Test(groups = {ICEBERG, PROFILE_SPECIFIC_TESTS}, dataProvider = "storageFormats")
public void testRegisterTableWithTableLocation(StorageFormat storageFormat)
throws TException
Expand Down