Skip to content

Fix copyWithAppendedNull for RowBlock with startOffset #26631

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
merged 1 commit into from
Sep 15, 2025
Merged

Fix copyWithAppendedNull for RowBlock with startOffset #26631

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
36 changes: 36 additions & 0 deletions core/trino-main/src/test/java/io/trino/block/TestRowBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,42 @@ public void testCompactBlock()
new ByteArrayBlock(6, Optional.of(rowIsNull), createExpectedValue(6).getBytes())}));
}

@Test
public void testCopyWithAppendedNull()
{
List<Type> fieldTypes = ImmutableList.of(VARCHAR, BIGINT);

// Test without startOffset
List<Object>[] testRows = generateTestRows(fieldTypes, 3);
RowBlock rowBlock = (RowBlock) createBlockBuilderWithValues(fieldTypes, testRows).build();

RowBlock appendedBlock = rowBlock.copyWithAppendedNull();
assertThat(appendedBlock.getPositionCount()).isEqualTo(testRows.length + 1);
for (int i = 0; i < testRows.length; i++) {
assertPositionValue(appendedBlock, i, testRows[i]);
}
assertThat(appendedBlock.isNull(appendedBlock.getPositionCount() - 1)).isTrue();

// Test with startOffset
RowBlock offsetBlock = rowBlock.getRegion(1, 2);
RowBlock offsetAppendedBlock = offsetBlock.copyWithAppendedNull();
assertThat(offsetAppendedBlock.getPositionCount()).isEqualTo(3);
for (int i = 0; i < 2; i++) {
assertPositionValue(offsetAppendedBlock, i, testRows[i + 1]);
}
assertThat(offsetAppendedBlock.isNull(2)).isTrue();

// Test startOffset + positionCount < fieldBlock[0].length
List<Object>[] largerTestRows = generateTestRows(fieldTypes, 10);
RowBlock partialBlock = (RowBlock) createBlockBuilderWithValues(fieldTypes, largerTestRows).build().getRegion(2, 5);
RowBlock partialAppendedBlock = partialBlock.copyWithAppendedNull();
assertThat(partialAppendedBlock.getPositionCount()).isEqualTo(6);
for (int i = 0; i < 5; i++) {
assertPositionValue(partialAppendedBlock, i, largerTestRows[i + 2]);
}
assertThat(partialAppendedBlock.isNull(5)).isTrue();
}

private void testWith(List<Type> fieldTypes, List<Object>[] expectedValues)
{
Block block = createBlockBuilderWithValues(fieldTypes, expectedValues).build();
Expand Down
6 changes: 3 additions & 3 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 @@ -249,13 +249,13 @@ public RowBlock copyWithAppendedNull()
{
boolean[] newRowIsNull;
if (rowIsNull != null) {
newRowIsNull = Arrays.copyOf(rowIsNull, positionCount + 1);
newRowIsNull = Arrays.copyOf(rowIsNull, startOffset + positionCount + 1);
}
else {
newRowIsNull = new boolean[positionCount + 1];
newRowIsNull = new boolean[startOffset + positionCount + 1];
}
// mark the (new) last element as null
newRowIsNull[positionCount] = true;
newRowIsNull[startOffset + positionCount] = true;

Block[] newBlocks = new Block[fieldBlocks.length];
for (int i = 0; i < fieldBlocks.length; i++) {
Expand Down