Skip to content

Allow field name declaration in ROW literal #25261

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow field name declaration in ROW literal #25261

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68aaf60
Allow ROW type to have no fields
dain Mar 12, 2025
b59bcb7
Rename AstVisitor visitRowField to visitRowDataTypeField
dain Mar 9, 2025
652c533
Allow field name declaration in row literal
dain Mar 12, 2025
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
4 changes: 0 additions & 4 deletions core/trino-spi/src/main/java/io/trino/spi/block/RowBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,6 @@ private RowBlock(int positionCount, @Nullable boolean[] rowIsNull, Block[] field
}

requireNonNull(fieldBlocks, "fieldBlocks is null");
if (fieldBlocks.length == 0) {
throw new IllegalArgumentException("Row block must contain at least one field");
}

for (int i = 0; i < fieldBlocks.length; i++) {
if (positionCount != fieldBlocks[i].getPositionCount()) {
throw new IllegalArgumentException("Expected field %s to have %s positions but has %s positions".formatted(i, positionCount, fieldBlocks[i].getPositionCount()));
Expand Down
5 changes: 0 additions & 5 deletions core/trino-spi/src/main/java/io/trino/spi/type/RowType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,6 @@ public static Field field(Type type)

private static TypeSignature makeSignature(List<Field> fields)
{
int size = fields.size();
if (size == 0) {
throw new IllegalArgumentException("Row type must have at least 1 field");
}

List<TypeSignatureParameter> parameters = fields.stream()
.map(field -> new NamedTypeSignature(field.getName().map(RowFieldName::new), field.getType().getTypeSignature()))
.map(TypeSignatureParameter::namedTypeParameter)
Expand Down
54 changes: 54 additions & 0 deletions core/trino-spi/src/test/java/io/trino/spi/type/TestRowType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,20 @@
*/
package io.trino.spi.type;

import io.trino.spi.block.Block;
import io.trino.spi.block.RowBlock;
import io.trino.spi.block.RowBlockBuilder;
import io.trino.spi.block.SqlRow;
import org.junit.jupiter.api.Test;

import java.util.List;

import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION_NOT_NULL;
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.BLOCK_BUILDER;
import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.NULLABLE_RETURN;
import static io.trino.spi.function.InvocationConvention.simpleConvention;
import static io.trino.spi.type.BooleanType.BOOLEAN;
import static io.trino.spi.type.DoubleType.DOUBLE;
import static io.trino.spi.type.VarcharType.VARCHAR;
Expand All @@ -27,6 +37,50 @@ public class TestRowType
{
private final TypeOperators typeOperators = new TypeOperators();

@Test
public void testEmptyRowType()
throws Throwable
{
RowType emptyRowType = RowType.rowType();
assertThat(emptyRowType).isEqualTo(RowType.rowType());
assertThat(emptyRowType.getFields()).isEmpty();

RowBlockBuilder blockBuilder = emptyRowType.createBlockBuilder(null, 1);
blockBuilder.buildEntry(fieldBuilders -> assertThat(fieldBuilders).isEmpty());
Block singleEmptyRow = blockBuilder.build();
assertThat(singleEmptyRow).isInstanceOf(RowBlock.class);
assertThat(singleEmptyRow.getPositionCount()).isEqualTo(1);
SqlRow emptyRow = emptyRowType.getObject(singleEmptyRow, 0);
assertThat(emptyRow.getFieldCount()).isEqualTo(0);

assertThat((boolean) typeOperators.getIndeterminateOperator(emptyRowType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL))
.invokeExact(singleEmptyRow, 0)).isFalse();
assertThat((Boolean) typeOperators.getEqualOperator(emptyRowType, simpleConvention(NULLABLE_RETURN, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL))
Copy link
Member

Choose a reason for hiding this comment

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

Why does this one have a different convention?

.invokeExact(singleEmptyRow, 0, singleEmptyRow, 0)).isTrue();
assertThat((boolean) typeOperators.getIdenticalOperator(emptyRowType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL))
.invokeExact(singleEmptyRow, 0, singleEmptyRow, 0)).isTrue();
assertThat((boolean) typeOperators.getLessThanOperator(emptyRowType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL))
.invokeExact(singleEmptyRow, 0, singleEmptyRow, 0)).isFalse();
assertThat((boolean) typeOperators.getLessThanOrEqualOperator(emptyRowType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL))
.invokeExact(singleEmptyRow, 0, singleEmptyRow, 0)).isTrue();
assertThat((long) typeOperators.getComparisonUnorderedFirstOperator(emptyRowType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL))
.invokeExact(singleEmptyRow, 0, singleEmptyRow, 0)).isZero();
assertThat((long) typeOperators.getComparisonUnorderedLastOperator(emptyRowType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL))
.invokeExact(singleEmptyRow, 0, singleEmptyRow, 0)).isZero();

assertThat((SqlRow) typeOperators.getReadValueOperator(emptyRowType, simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL)).invokeExact(singleEmptyRow, 0))
.matches(row -> row.getFieldCount() == 0);

// write data into a block builder
blockBuilder = emptyRowType.createBlockBuilder(null, 1);
typeOperators.getReadValueOperator(emptyRowType, simpleConvention(BLOCK_BUILDER, NEVER_NULL)).invoke(emptyRow, blockBuilder);
Block newBlock = blockBuilder.build();
assertThat(newBlock).isInstanceOf(RowBlock.class);
assertThat(newBlock.getPositionCount()).isEqualTo(1);
SqlRow newRow = emptyRowType.getObject(newBlock, 0);
assertThat(newRow.getFieldCount()).isEqualTo(0);
}

@Test
public void testRowDisplayName()
{
Expand Down