Skip to content

Test: Make update respect non nullability of columns #13679

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
ebyhr wants to merge 2 commits into from
Closed

Test: Make update respect non nullability of columns #13679

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
064f753
Make update respect non nullability of columns
homar Aug 11, 2022
2392760
empty
homar Aug 13, 2022
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
39 changes: 32 additions & 7 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 @@ -73,6 +73,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 @@ -144,6 +145,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 @@ -543,8 +545,9 @@ 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);
Metadata metadata = plannerContext.getMetadata();
TableSchema tableSchema = metadata.getTableSchema(session, handle);
Map<String, ColumnHandle> columnMap = metadata.getColumnHandles(session, handle);
List<ColumnSchema> columnsSchemas = tableSchema.getColumns();

List<String> targetColumnNames = node.getAssignments().stream()
Expand Down Expand Up @@ -584,10 +587,32 @@ public UpdateNode plan(Update node)
PlanAndMappings planAndMappings = coerce(builder, orderedColumnValues, analysis, idAllocator, symbolAllocator, typeCoercion);
builder = planAndMappings.getSubPlan();

ImmutableList.Builder<Symbol> updatedColumnValuesBuilder = ImmutableList.builder();
orderedColumnValues.forEach(columnValue -> updatedColumnValuesBuilder.add(planAndMappings.get(columnValue)));
TableMetadata tableMetadata = metadata.getTableMetadata(session, handle);
ImmutableMap<String, Integer> updatedColumnNameToIndex = IntStream.range(0, updatedColumnNames.size())
.boxed()
.collect(toImmutableMap(updatedColumnNames::get, i -> i));
ImmutableList.Builder<Symbol> updatedNonNullableColumnsValuesBuilder = ImmutableList.builder();
Assignments.Builder assignmentsBuilder = Assignments.builder();
assignmentsBuilder.putIdentities(builder.getRoot().getOutputSymbols());

for (ColumnMetadata column : tableMetadata.getColumns()) {
if (targetColumnNames.contains(column.getName())) {
Symbol output = symbolAllocator.newSymbol(column.getName(), column.getType());
updatedNonNullableColumnsValuesBuilder.add(output);
@SuppressWarnings("ConstantConditions") int columnIndex = updatedColumnNameToIndex.get(column.getName());
Expression expression = ((ProjectNode) builder.getRoot()).getAssignments().get(planAndMappings.get(orderedColumnValues.get(columnIndex)));
if (!column.isNullable()) {
expression = new CoalesceExpression(expression, new Cast(failFunction(metadata, session, INVALID_ARGUMENTS, format(
"NULL value not allowed for NOT NULL column: %s",
column.getName())), toSqlType(column.getType())));
}
assignmentsBuilder.put(output, expression);
}
}
ProjectNode projectNode = new ProjectNode(idAllocator.getNextId(), builder.getRoot(), assignmentsBuilder.build());
builder = builder.withNewRoot(projectNode);
Symbol rowId = builder.translate(analysis.getRowIdField(table));
updatedColumnValuesBuilder.add(rowId);
updatedNonNullableColumnsValuesBuilder.add(rowId);

List<Symbol> outputs = ImmutableList.of(
symbolAllocator.newSymbol("partialrows", BIGINT),
Expand All @@ -602,11 +627,11 @@ public UpdateNode plan(Update node)
builder.getRoot(),
new UpdateTarget(
Optional.empty(),
plannerContext.getMetadata().getTableMetadata(session, handle).getTable(),
tableMetadata.getTable(),
updatedColumnNames,
updatedColumnHandles),
rowId,
updatedColumnValuesBuilder.build(),
updatedNonNullableColumnsValuesBuilder.build(),
outputs);
}

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 @@ -2824,6 +2824,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