Skip to content

Make UPDATE respect non nullability of columns #13644

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
martint merged 1 commit into from
Aug 19, 2022
Merged

Make UPDATE respect non nullability of columns #13644

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
44 changes: 36 additions & 8 deletions core/trino-main/src/main/java/io/trino/sql/planner/QueryPlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import io.trino.metadata.TableHandle;
import io.trino.metadata.TableLayout;
import io.trino.metadata.TableMetadata;
import io.trino.metadata.TableSchema;
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.connector.ColumnMetadata;
import io.trino.spi.connector.ColumnSchema;
import io.trino.spi.connector.RowChangeParadigm;
import io.trino.spi.connector.SortOrder;
Expand Down Expand Up @@ -72,6 +72,7 @@
import io.trino.sql.planner.plan.ValuesNode;
import io.trino.sql.planner.plan.WindowNode;
import io.trino.sql.tree.Cast;
import io.trino.sql.tree.CoalesceExpression;
import io.trino.sql.tree.ComparisonExpression;
import io.trino.sql.tree.DecimalLiteral;
import io.trino.sql.tree.Delete;
Expand Down Expand Up @@ -143,6 +144,7 @@
import static com.google.common.collect.Iterables.getOnlyElement;
import static io.trino.SystemSessionProperties.getMaxRecursionDepth;
import static io.trino.SystemSessionProperties.isSkipRedundantSort;
import static io.trino.spi.StandardErrorCode.INVALID_ARGUMENTS;
import static io.trino.spi.StandardErrorCode.INVALID_WINDOW_FRAME;
import static io.trino.spi.StandardErrorCode.MERGE_TARGET_ROW_MULTIPLE_MATCHES;
import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
Expand Down Expand Up @@ -180,6 +182,7 @@
import static io.trino.type.IntervalYearMonthType.INTERVAL_YEAR_MONTH;
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
import static java.util.function.Function.identity;

class QueryPlanner
{
Expand Down Expand Up @@ -542,9 +545,11 @@ public UpdateNode plan(Update node)
Table table = node.getTable();
TableHandle handle = analysis.getTableHandle(table);

TableSchema tableSchema = plannerContext.getMetadata().getTableSchema(session, handle);
Map<String, ColumnHandle> columnMap = plannerContext.getMetadata().getColumnHandles(session, handle);
List<ColumnSchema> columnsSchemas = tableSchema.getColumns();
Metadata metadata = plannerContext.getMetadata();
// TODO obtaining metadata should not happen here https://github.com/trinodb/trino/issues/13740
TableMetadata tableMetadata = metadata.getTableMetadata(session, handle);
Map<String, ColumnHandle> columnMap = metadata.getColumnHandles(session, handle);
List<ColumnMetadata> columnsMetadata = tableMetadata.getColumns();

List<String> targetColumnNames = node.getAssignments().stream()
.map(assignment -> assignment.getName().getValue())
Expand All @@ -554,8 +559,8 @@ public UpdateNode plan(Update node)
ImmutableList.Builder<String> updatedColumnNamesBuilder = ImmutableList.builder();
ImmutableList.Builder<ColumnHandle> updatedColumnHandlesBuilder = ImmutableList.builder();
ImmutableList.Builder<Expression> orderedColumnValuesBuilder = ImmutableList.builder();
for (ColumnSchema columnSchema : columnsSchemas) {
String name = columnSchema.getName();
for (ColumnMetadata columnMetadata : columnsMetadata) {
String name = columnMetadata.getName();
int index = targetColumnNames.indexOf(name);
if (index >= 0) {
updatedColumnNamesBuilder.add(name);
Expand Down Expand Up @@ -584,7 +589,30 @@ public UpdateNode plan(Update node)
builder = planAndMappings.getSubPlan();

ImmutableList.Builder<Symbol> updatedColumnValuesBuilder = ImmutableList.builder();
orderedColumnValues.forEach(columnValue -> updatedColumnValuesBuilder.add(planAndMappings.get(columnValue)));
Assignments.Builder assignmentsBuilder = Assignments.builder();
assignmentsBuilder.putIdentities(builder.getRoot().getOutputSymbols());
Map<String, ColumnMetadata> columnNameToMetadata = columnsMetadata.stream()
.collect(toImmutableMap(ColumnMetadata::getName, identity()));

for (int i = 0; i < updatedColumnNames.size(); i++) {
String columName = updatedColumnNames.get(i);
ColumnMetadata columnMetadata = columnNameToMetadata.get(columName);
Symbol output = symbolAllocator.newSymbol(columName, columnMetadata.getType());
updatedColumnValuesBuilder.add(output);
Expression expression = planAndMappings.get(orderedColumnValues.get(i)).toSymbolReference();
if (!columnMetadata.isNullable()) {
expression = new CoalesceExpression(expression, new Cast(
failFunction(
metadata,
session,
INVALID_ARGUMENTS,
"NULL value not allowed for NOT NULL column: " + columName),
toSqlType(columnMetadata.getType())));
}
assignmentsBuilder.put(output, expression);
}

builder = builder.withNewRoot(new ProjectNode(idAllocator.getNextId(), builder.getRoot(), assignmentsBuilder.build()));
Symbol rowId = builder.translate(analysis.getRowIdField(table));
updatedColumnValuesBuilder.add(rowId);

Expand All @@ -601,7 +629,7 @@ public UpdateNode plan(Update node)
builder.getRoot(),
new UpdateTarget(
Optional.empty(),
plannerContext.getMetadata().getTableMetadata(session, handle).getTable(),
tableMetadata.getTable(),
updatedColumnNames,
updatedColumnHandles),
rowId,
Expand Down
21 changes: 21 additions & 0 deletions testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2869,6 +2869,27 @@ public void testInsertIntoNotNullColumn()
}
}

@Test
public void testUpdateNotNullColumn()
{
skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
skipTestUnless(hasBehavior(SUPPORTS_UPDATE));

if (!hasBehavior(SUPPORTS_NOT_NULL_CONSTRAINT)) {
assertQueryFails(
"CREATE TABLE not_null_constraint (not_null_col INTEGER NOT NULL)",
format("line 1:35: Catalog '%s' does not support non-null column for column name 'not_null_col'", getSession().getCatalog().orElseThrow()));
return;
}

try (TestTable table = new TestTable(getQueryRunner()::execute, "update_not_null", "(nullable_col INTEGER, not_null_col INTEGER NOT NULL)")) {
assertUpdate(format("INSERT INTO %s (nullable_col, not_null_col) VALUES (1, 10)", table.getName()), 1);
assertQuery("SELECT * FROM " + table.getName(), "VALUES (1, 10)");
assertQueryFails("UPDATE " + table.getName() + " SET not_null_col = NULL WHERE nullable_col = 1", "NULL value not allowed for NOT NULL column: not_null_col");
assertQueryFails("UPDATE " + table.getName() + " SET not_null_col = TRY(5/0) where nullable_col = 1", "NULL value not allowed for NOT NULL column: not_null_col");
}
}

@Language("RegExp")
protected String errorMessageForInsertIntoNotNullColumn(String columnName)
{
Expand Down