Skip to content

Disallow adding not null column when Delta Lake table is not empty #13785

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
Aug 23, 2022
Merged

Disallow adding not null column when Delta Lake table is not empty #13785

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
10 changes: 5 additions & 5 deletions plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,10 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
DeltaLakeTableHandle handle = (DeltaLakeTableHandle) tableHandle;
checkSupportedWriterVersion(session, handle.getSchemaTableName());

if (!newColumnMetadata.isNullable() && !metastore.getValidDataFiles(handle.getSchemaTableName(), session).isEmpty()) {
throw new TrinoException(DELTA_LAKE_BAD_WRITE, format("Unable to add NOT NULL column '%s' for non-empty table: %s.%s", newColumnMetadata.getName(), handle.getSchemaName(), handle.getTableName()));
}

ConnectorTableMetadata tableMetadata = getTableMetadata(session, handle);

try {
Expand All @@ -1137,10 +1141,6 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
columnsNullability.putAll(getColumnsNullability(handle.getMetadataEntry()));
columnsNullability.put(newColumnMetadata.getName(), newColumnMetadata.isNullable());

ImmutableMap.Builder<String, Boolean> columnNullability = ImmutableMap.builder();
columnNullability.putAll(getColumnsNullability(handle.getMetadataEntry()));
columnNullability.put(newColumnMetadata.getName(), true);

ImmutableMap.Builder<String, Map<String, Object>> columnMetadata = ImmutableMap.builder();
columnMetadata.putAll(getColumnsMetadata(handle.getMetadataEntry()));
columnMetadata.put(newColumnMetadata.getName(), ImmutableMap.of());
Expand All @@ -1153,7 +1153,7 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
columnsBuilder.build(),
partitionColumns,
columnComments.buildOrThrow(),
columnNullability.buildOrThrow(),
columnsNullability.buildOrThrow(),
Copy link
Copy Markdown
Member

@homar homar Aug 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be a separate commit ?

Copy link
Copy Markdown
Member

@findepi findepi Aug 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's related: we allow adding NOT NULL for empty tables
(previously it was ignored)

i think it;s fine to keep as one commit

columnMetadata.buildOrThrow(),
handle.getMetadataEntry().getConfiguration(),
ADD_COLUMN_OPERATION,
Expand Down
6 changes: 2 additions & 4 deletions ...o-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeMinioConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,11 +826,9 @@ public void testTableWithNonNullableColumns()
}

@Override
public void testAddNotNullColumnToNonEmptyTable()
protected void verifyAddNotNullColumnToNonEmptyTableFailurePermissible(Throwable e)
{
// TODO https://github.com/trinodb/trino/issues/13587 Disallow adding a new column when the table isn't empty
assertThatThrownBy(super::testAddNotNullColumnToNonEmptyTable)
.hasMessageContaining("expected [false] but found [true]");
assertThat(e).hasMessageMatching("Unable to add NOT NULL column '.*' for non-empty table: .*");
}

@Override
Expand Down