Skip to content
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

Support FIRST, AFTER and LAST clause when adding a new column in engine and Iceberg connector #20914

Merged
merged 2 commits into from
Jan 17, 2025
Merged

Support FIRST, AFTER and LAST clause when adding a new column in engine and Iceberg connector #20914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dd5200
Support FIRST and AFTER clause when adding a new column in engine
ebyhr Mar 4, 2024
0c5c12c
Support FIRST and AFTER clause when adding a new column in Iceberg
ebyhr Nov 22, 2024
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
3 changes: 2 additions & 1 deletion core/trino-grammar/src/main/antlr4/io/trino/grammar/sql/SqlBase.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ statement
| ALTER TABLE (IF EXISTS)? from=qualifiedName
RENAME TO to=qualifiedName #renameTable
| ALTER TABLE (IF EXISTS)? tableName=qualifiedName
ADD COLUMN (IF NOT EXISTS)? column=columnDefinition #addColumn
ADD COLUMN (IF NOT EXISTS)? column=columnDefinition
(FIRST | LAST | AFTER after=identifier)? #addColumn
| ALTER TABLE (IF EXISTS)? tableName=qualifiedName
RENAME COLUMN (IF EXISTS)? from=qualifiedName TO to=identifier #renameColumn
| ALTER TABLE (IF EXISTS)? tableName=qualifiedName
Expand Down
25 changes: 24 additions & 1 deletion core/trino-main/src/main/java/io/trino/execution/AddColumnTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.trino.sql.PlannerContext;
import io.trino.sql.tree.AddColumn;
import io.trino.sql.tree.ColumnDefinition;
import io.trino.sql.tree.ColumnPosition;
import io.trino.sql.tree.Expression;
import io.trino.sql.tree.Identifier;

Expand Down Expand Up @@ -110,6 +111,7 @@ public ListenableFuture<Void> execute(

ColumnDefinition element = statement.getColumn();
Identifier columnName = element.getName().getOriginalParts().get(0);
ColumnPosition position = statement.getPosition().orElse(new ColumnPosition.Last());
Type type;
try {
type = plannerContext.getTypeManager().getType(toTypeSignature(element.getType()));
Expand All @@ -133,6 +135,9 @@ public ListenableFuture<Void> execute(
if (!element.isNullable() && !plannerContext.getMetadata().getConnectorCapabilities(session, catalogHandle).contains(NOT_NULL_COLUMN_CONSTRAINT)) {
throw semanticException(NOT_SUPPORTED, element, "Catalog '%s' does not support NOT NULL for column '%s'", catalogHandle, columnName);
}
if (position instanceof ColumnPosition.After after && !columns.containsKey(after.column().getValue().toLowerCase(ENGLISH))) {
throw semanticException(COLUMN_NOT_FOUND, statement, "Column '%s' does not", after.column().getValue());
}

Map<String, Object> columnProperties = columnPropertyManager.getProperties(
catalogHandle.getCatalogName().toString(),
Expand All @@ -152,14 +157,23 @@ public ListenableFuture<Void> execute(
.setProperties(columnProperties)
.build();

plannerContext.getMetadata().addColumn(session, tableHandle, qualifiedTableName.asCatalogSchemaTableName(), column);
plannerContext.getMetadata().addColumn(
session,
tableHandle,
qualifiedTableName.asCatalogSchemaTableName(),
column,
toConnectorColumnPosition(position));
}
else {
accessControl.checkCanAlterColumn(session.toSecurityContext(), qualifiedTableName);

if (!columns.containsKey(columnName.getValue().toLowerCase(ENGLISH))) {
throw semanticException(COLUMN_NOT_FOUND, statement, "Column '%s' does not exist", columnName);
}
if (!(position instanceof ColumnPosition.Last)) {
// TODO https://github.com/trinodb/trino/issues/24513 Support FIRST and AFTER options
throw semanticException(NOT_SUPPORTED, statement, "Specifying column position is not supported for nested columns");
}

List<String> parentPath = statement.getColumn().getName().getOriginalParts().subList(0, statement.getColumn().getName().getOriginalParts().size() - 1).stream()
.map(identifier -> identifier.getValue().toLowerCase(ENGLISH))
Expand Down Expand Up @@ -234,4 +248,13 @@ private Type getSupportedType(Session session, CatalogHandle catalogHandle, Map<
.getSupportedType(session, catalogHandle, tableProperties, type)
.orElse(type);
}

private static io.trino.spi.connector.ColumnPosition toConnectorColumnPosition(ColumnPosition columnPosition)
{
return switch (columnPosition) {
case ColumnPosition.First _ -> new io.trino.spi.connector.ColumnPosition.First();
case ColumnPosition.After after -> new io.trino.spi.connector.ColumnPosition.After(after.column().getValue().toLowerCase(ENGLISH));
case ColumnPosition.Last _ -> new io.trino.spi.connector.ColumnPosition.Last();
};
}
}
3 changes: 2 additions & 1 deletion core/trino-main/src/main/java/io/trino/metadata/Metadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import io.trino.spi.connector.CatalogSchemaTableName;
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.connector.ColumnMetadata;
import io.trino.spi.connector.ColumnPosition;
import io.trino.spi.connector.ConnectorCapabilities;
import io.trino.spi.connector.ConnectorOutputMetadata;
import io.trino.spi.connector.ConnectorTableMetadata;
Expand Down Expand Up @@ -276,7 +277,7 @@ Optional<TableExecuteHandle> getTableHandleForExecute(
/**
* Add the specified column to the table.
*/
void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column);
void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column, ColumnPosition position);

/**
* Add the specified field to the column.
Expand Down
5 changes: 3 additions & 2 deletions core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import io.trino.spi.connector.CatalogSchemaTableName;
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.connector.ColumnMetadata;
import io.trino.spi.connector.ColumnPosition;
import io.trino.spi.connector.ConnectorAnalyzeMetadata;
import io.trino.spi.connector.ConnectorCapabilities;
import io.trino.spi.connector.ConnectorInsertTableHandle;
Expand Down Expand Up @@ -956,12 +957,12 @@ public void renameField(Session session, TableHandle tableHandle, List<String> f
}

@Override
public void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column)
public void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column, ColumnPosition position)
{
CatalogHandle catalogHandle = tableHandle.catalogHandle();
CatalogMetadata catalogMetadata = getCatalogMetadataForWrite(session, catalogHandle.getCatalogName().toString());
ConnectorMetadata metadata = getMetadataForWrite(session, catalogHandle);
metadata.addColumn(session.toConnectorSession(catalogHandle), tableHandle.connectorHandle(), column);
metadata.addColumn(session.toConnectorSession(catalogHandle), tableHandle.connectorHandle(), column, position);
if (catalogMetadata.getSecurityManagement() == SYSTEM) {
systemSecurityMetadata.columnCreated(session, table, column.getName());
}
Expand Down
10 changes: 10 additions & 0 deletions core/trino-main/src/main/java/io/trino/tracing/TracingConnectorMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import io.trino.spi.connector.CatalogSchemaTableName;
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.connector.ColumnMetadata;
import io.trino.spi.connector.ColumnPosition;
import io.trino.spi.connector.ConnectorAccessControl;
import io.trino.spi.connector.ConnectorAnalyzeMetadata;
import io.trino.spi.connector.ConnectorInsertTableHandle;
Expand Down Expand Up @@ -478,6 +479,15 @@ public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle
}
}

@Override
public void addColumn(ConnectorSession session, ConnectorTableHandle tableHandle, ColumnMetadata column, ColumnPosition position)
{
Span span = startSpan("addColumn", tableHandle);
try (var ignored = scopedSpan(span)) {
delegate.addColumn(session, tableHandle, column, position);
}
}

@Override
public void addField(ConnectorSession session, ConnectorTableHandle tableHandle, List<String> parentPath, String fieldName, Type type, boolean ignoreExisting)
{
Expand Down
5 changes: 3 additions & 2 deletions core/trino-main/src/main/java/io/trino/tracing/TracingMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import io.trino.spi.connector.CatalogSchemaTableName;
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.connector.ColumnMetadata;
import io.trino.spi.connector.ColumnPosition;
import io.trino.spi.connector.ConnectorCapabilities;
import io.trino.spi.connector.ConnectorOutputMetadata;
import io.trino.spi.connector.ConnectorTableMetadata;
Expand Down Expand Up @@ -485,11 +486,11 @@ public void renameField(Session session, TableHandle tableHandle, List<String> f
}

@Override
public void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column)
public void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column, ColumnPosition position)
{
Span span = startSpan("addColumn", table);
try (var _ = scopedSpan(span)) {
delegate.addColumn(session, tableHandle, table, column);
delegate.addColumn(session, tableHandle, table, column, position);
}
}

Expand Down
23 changes: 20 additions & 3 deletions core/trino-main/src/test/java/io/trino/execution/BaseDataDefinitionTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import io.trino.spi.connector.CatalogSchemaTableName;
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.connector.ColumnMetadata;
import io.trino.spi.connector.ColumnPosition;
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.spi.connector.SaveMode;
import io.trino.spi.connector.SchemaTableName;
Expand Down Expand Up @@ -374,14 +375,30 @@ public Optional<Type> getSupportedType(Session session, CatalogHandle catalogHan
}

@Override
public void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column)
public void addColumn(Session session, TableHandle tableHandle, CatalogSchemaTableName table, ColumnMetadata column, ColumnPosition position)
{
SchemaTableName tableName = table.getSchemaTableName();
ConnectorTableMetadata metadata = tables.get(tableName);

ImmutableList.Builder<ColumnMetadata> columns = ImmutableList.builderWithExpectedSize(metadata.getColumns().size() + 1);
columns.addAll(metadata.getColumns());
columns.add(column);
switch (position) {
case ColumnPosition.First _ -> {
columns.add(column);
columns.addAll(metadata.getColumns());
}
case ColumnPosition.After after -> {
for (ColumnMetadata existingColumn : metadata.getColumns()) {
columns.add(existingColumn);
if (existingColumn.getName().equals(after.columnName())) {
columns.add(column);
}
}
}
case ColumnPosition.Last _ -> {
columns.addAll(metadata.getColumns());
columns.add(column);
}
}
tables.put(tableName, new ConnectorTableMetadata(tableName, columns.build()));
}

Expand Down
Loading
Loading