Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ private static Block resourceGroupIdToBlock(ResourceGroupId resourceGroupId)
{
requireNonNull(resourceGroupId, "resourceGroupId is null");
List<String> segments = resourceGroupId.getSegments();
BlockBuilder blockBuilder = createUnboundedVarcharType().createBlockBuilder(null, segments.size());
BlockBuilder blockBuilder = createUnboundedVarcharType().createBlockBuilder(segments.size());
for (String segment : segments) {
createUnboundedVarcharType().writeSlice(blockBuilder, utf8Slice(segment));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public ConnectorPageSource pageSource(ConnectorTransactionHandle transactionHand

int positionCount = ruleStats.size();
Map<String, BlockBuilder> blockBuilders = ruleStatsTable.getColumns().stream()
.collect(toImmutableMap(ColumnMetadata::getName, column -> column.getType().createBlockBuilder(null, positionCount)));
.collect(toImmutableMap(ColumnMetadata::getName, column -> column.getType().createBlockBuilder(positionCount)));

for (Map.Entry<Class<?>, RuleStats> entry : ruleStats.entrySet()) {
RuleStats stats = entry.getValue();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
private static Block createStringsBlock(List<String> values)
{
VarcharType varchar = createUnboundedVarcharType();
BlockBuilder builder = varchar.createBlockBuilder(null, values.size());
BlockBuilder builder = varchar.createBlockBuilder(values.size());
for (String value : values) {
if (value == null) {
builder.appendNull();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public Page getOutput()
operatorContext.getSession(),
verbose,
version);
BlockBuilder builder = VARCHAR.createBlockBuilder(null, 1);
BlockBuilder builder = VARCHAR.createBlockBuilder(1);
VARCHAR.writeString(builder, plan);

outputConsumed = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public FlatGroupByHash(FlatGroupByHash other)
return null;
}
ValueBlock valueBlock = builder.buildValueBlock();
BlockBuilder newBuilder = builder.newBlockBuilderLike(null);
BlockBuilder newBuilder = builder.newBlockBuilderLike();
newBuilder.appendRange(valueBlock, 0, valueBlock.getPositionCount());
return newBuilder;
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ private Page buildOutputPage(Page page)
for (int i = 0; i < aggregatorFactories.size(); i++) {
GroupedAggregator groupedAggregator = aggregatorFactories.get(i).createGroupedAggregator(aggregationMetrics);
groupedAggregator.processPage(positionCount, groupIds, page);
BlockBuilder outputBuilder = groupedAggregator.getType().createBlockBuilder(null, positionCount);
BlockBuilder outputBuilder = groupedAggregator.getType().createBlockBuilder(positionCount);
for (int position = 0; position < positionCount; position++) {
groupedAggregator.evaluate(position, outputBuilder);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ public NonPartitioningColumnProvider(int inputChannel, int indexChannel)
public Block getPassThroughColumn(Page page)
{
Block indexes = page.getBlock(indexChannel);
BlockBuilder builder = type.createBlockBuilder(null, page.getPositionCount());
BlockBuilder builder = type.createBlockBuilder(page.getPositionCount());
for (int position = 0; position < page.getPositionCount(); position++) {
if (indexes.isNull(position)) {
builder.appendNull();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private PositionsAppender createPrimitiveAppender(Type type, int expectedPositio
// it is guaranteed Math.min will not overflow; safe to cast
int expectedBytes = (int) min((long) expectedPositions * EXPECTED_VARIABLE_WIDTH_BYTES_PER_ENTRY, maxPageSizeInBytes);
expectedBytes = min(expectedBytes, MAX_ARRAY_SIZE);
return new TypedPositionsAppender(new VariableWidthBlockBuilder(null, expectedPositions, expectedBytes));
return new TypedPositionsAppender(new VariableWidthBlockBuilder(expectedPositions, expectedBytes));
}
return new TypedPositionsAppender(type, expectedPositions);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ else if (hasNullRow) {
result = RunLengthEncodedBlock.create(nullRowBlock, positionCount);
}
else {
result = type.createBlockBuilder(null, 0).build();
result = type.createBlockBuilder(0).build();
}

reset();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class TypedPositionsAppender

TypedPositionsAppender(Type type, int expectedPositions)
{
this.blockBuilder = type.createBlockBuilder(null, expectedPositions);
this.blockBuilder = type.createBlockBuilder(expectedPositions);
}

public TypedPositionsAppender(BlockBuilder blockBuilder)
Expand Down Expand Up @@ -74,7 +74,7 @@ public Block build()
public void reset()
{
if (blockBuilder.getPositionCount() > 0) {
blockBuilder = blockBuilder.newBlockBuilderLike(null);
blockBuilder = blockBuilder.newBlockBuilderLike();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public GeneratedPageProjection(RowExpression projection, boolean isDeterministic
this.isDeterministic = isDeterministic;
this.inputChannels = requireNonNull(inputChannels, "inputChannels is null");
this.pageProjectionWorkFactory = requireNonNull(pageProjectionWorkFactory, "pageProjectionWorkFactory is null");
this.blockBuilder = projection.type().createBlockBuilder(null, 1);
this.blockBuilder = projection.type().createBlockBuilder(1);
}

@Override
Expand All @@ -60,7 +60,7 @@ public InputChannels getInputChannels()
@Override
public Block project(ConnectorSession session, SourcePage page, SelectedPositions selectedPositions)
{
blockBuilder = blockBuilder.newBlockBuilderLike(selectedPositions.size(), null);
blockBuilder = blockBuilder.newBlockBuilderLike(selectedPositions.size());
try {
return ((PageProjectionWork) pageProjectionWorkFactory.invoke(blockBuilder, session, page, selectedPositions)).process();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import io.trino.spi.block.ArrayBlock;
import io.trino.spi.block.Block;
import io.trino.spi.block.DictionaryBlock;
import io.trino.spi.block.PageBuilderStatus;
import io.trino.spi.function.Description;
import io.trino.spi.function.ScalarFunction;
import io.trino.spi.function.SqlType;
Expand Down Expand Up @@ -61,7 +60,7 @@ public static Block combinations(

ArrayType arrayType = new ArrayType(elementType);
if (combinationLength > arrayLength) {
return arrayType.createBlockBuilder(new PageBuilderStatus().createBlockBuilderStatus(), 0).build();
return arrayType.createBlockBuilder(0).build();
}

int combinationCount = combinationCount(arrayLength, combinationLength);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private ArrayConcatUtils() {}
@UsedByGeneratedCode
public static Block appendElement(Type elementType, Block block, long value)
{
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, block.getPositionCount() + 1);
BlockBuilder blockBuilder = elementType.createBlockBuilder(block.getPositionCount() + 1);
blockBuilder.appendBlockRange(block, 0, block.getPositionCount());

elementType.writeLong(blockBuilder, value);
Expand All @@ -37,7 +37,7 @@ public static Block appendElement(Type elementType, Block block, long value)
@UsedByGeneratedCode
public static Block appendElement(Type elementType, Block block, boolean value)
{
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, block.getPositionCount() + 1);
BlockBuilder blockBuilder = elementType.createBlockBuilder(block.getPositionCount() + 1);
blockBuilder.appendBlockRange(block, 0, block.getPositionCount());

elementType.writeBoolean(blockBuilder, value);
Expand All @@ -48,7 +48,7 @@ public static Block appendElement(Type elementType, Block block, boolean value)
@UsedByGeneratedCode
public static Block appendElement(Type elementType, Block block, double value)
{
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, block.getPositionCount() + 1);
BlockBuilder blockBuilder = elementType.createBlockBuilder(block.getPositionCount() + 1);
blockBuilder.appendBlockRange(block, 0, block.getPositionCount());

elementType.writeDouble(blockBuilder, value);
Expand All @@ -59,7 +59,7 @@ public static Block appendElement(Type elementType, Block block, double value)
@UsedByGeneratedCode
public static Block appendElement(Type elementType, Block block, Slice value)
{
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, block.getPositionCount() + 1);
BlockBuilder blockBuilder = elementType.createBlockBuilder(block.getPositionCount() + 1);
blockBuilder.appendBlockRange(block, 0, block.getPositionCount());

elementType.writeSlice(blockBuilder, value);
Expand All @@ -70,7 +70,7 @@ public static Block appendElement(Type elementType, Block block, Slice value)
@UsedByGeneratedCode
public static Block appendElement(Type elementType, Block block, Object value)
{
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, block.getPositionCount() + 1);
BlockBuilder blockBuilder = elementType.createBlockBuilder(block.getPositionCount() + 1);
blockBuilder.appendBlockRange(block, 0, block.getPositionCount());

elementType.writeObject(blockBuilder, value);
Expand All @@ -82,7 +82,7 @@ public static Block appendElement(Type elementType, Block block, Object value)
@UsedByGeneratedCode
public static Block prependElement(Type elementType, Slice value, Block block)
{
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, block.getPositionCount() + 1);
BlockBuilder blockBuilder = elementType.createBlockBuilder(block.getPositionCount() + 1);

elementType.writeSlice(blockBuilder, value);
blockBuilder.appendBlockRange(block, 0, block.getPositionCount());
Expand All @@ -93,7 +93,7 @@ public static Block prependElement(Type elementType, Slice value, Block block)
@UsedByGeneratedCode
public static Block prependElement(Type elementType, Object value, Block block)
{
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, block.getPositionCount() + 1);
BlockBuilder blockBuilder = elementType.createBlockBuilder(block.getPositionCount() + 1);

elementType.writeObject(blockBuilder, value);
blockBuilder.appendBlockRange(block, 0, block.getPositionCount());
Expand All @@ -104,7 +104,7 @@ public static Block prependElement(Type elementType, Object value, Block block)
@UsedByGeneratedCode
public static Block prependElement(Type elementType, long value, Block block)
{
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, block.getPositionCount() + 1);
BlockBuilder blockBuilder = elementType.createBlockBuilder(block.getPositionCount() + 1);

elementType.writeLong(blockBuilder, value);
blockBuilder.appendBlockRange(block, 0, block.getPositionCount());
Expand All @@ -115,7 +115,7 @@ public static Block prependElement(Type elementType, long value, Block block)
@UsedByGeneratedCode
public static Block prependElement(Type elementType, boolean value, Block block)
{
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, block.getPositionCount() + 1);
BlockBuilder blockBuilder = elementType.createBlockBuilder(block.getPositionCount() + 1);

elementType.writeBoolean(blockBuilder, value);
blockBuilder.appendBlockRange(block, 0, block.getPositionCount());
Expand All @@ -126,7 +126,7 @@ public static Block prependElement(Type elementType, boolean value, Block block)
@UsedByGeneratedCode
public static Block prependElement(Type elementType, double value, Block block)
{
BlockBuilder blockBuilder = elementType.createBlockBuilder(null, block.getPositionCount() + 1);
BlockBuilder blockBuilder = elementType.createBlockBuilder(block.getPositionCount() + 1);

elementType.writeDouble(blockBuilder, value);
blockBuilder.appendBlockRange(block, 0, block.getPositionCount());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
public static Block flatten(Type type, Type arrayType, Block array)
{
if (array.getPositionCount() == 0) {
return type.createBlockBuilder(null, 0).build();
return type.createBlockBuilder(0).build();
}

BlockBuilder builder = type.createBlockBuilder(null, array.getPositionCount(), toIntExact(array.getSizeInBytes() / array.getPositionCount()));
BlockBuilder builder = type.createBlockBuilder(array.getPositionCount(), toIntExact(array.getSizeInBytes() / array.getPositionCount()));
for (int i = 0; i < array.getPositionCount(); i++) {
if (!array.isNull(i)) {
Block subArray = (Block) arrayType.getObject(array, i);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static SqlMap arrayHistogram(
histogram.add(0, valueBlock, position, 1L);
}
}
MapBlockBuilder blockBuilder = mapType.createBlockBuilder(null, histogram.size());
MapBlockBuilder blockBuilder = mapType.createBlockBuilder(histogram.size());
histogram.serialize(0, blockBuilder);
MapBlock mapBlock = (MapBlock) blockBuilder.build();
return mapType.getObject(mapBlock, 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static Block slice(
long toIndex = Math.min(fromIndex + length, size + 1);

if (fromIndex >= toIndex || fromIndex < 1) {
return type.createBlockBuilder(null, 0).build();
return type.createBlockBuilder(0).build();
}

return array.getRegion((int) (fromIndex - 1), (int) (toIndex - fromIndex));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static Block filter(
throws Throwable
{
int positionCount = array.getPositionCount();
BlockBuilder resultBuilder = resultType.createBlockBuilder(null, positionCount);
BlockBuilder resultBuilder = resultType.createBlockBuilder(positionCount);
for (int position = 0; position < positionCount; position++) {
if (array.isNull(position)) {
resultBuilder.appendNull();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static Block union(
set.add(rightArray, i);
}

BlockBuilder blockBuilder = type.createBlockBuilder(null, set.size());
BlockBuilder blockBuilder = type.createBlockBuilder(set.size());
set.getAllWithSizeLimit(blockBuilder, "array_union", MAX_FUNCTION_MEMORY);
return blockBuilder.build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public static Block regexpExtractAll(@SqlType("varchar(x)") Slice source, @SqlTy
{
Matcher matcher = pattern.matcher(source.getBytes());
validateGroup(groupIndex, matcher.getEagerRegion());
BlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, 32);
BlockBuilder blockBuilder = VARCHAR.createBlockBuilder(32);
int group = toIntExact(groupIndex);

int nextStart = 0;
Expand Down Expand Up @@ -278,7 +278,7 @@ public static Slice regexpExtract(@SqlType("varchar(x)") Slice source, @SqlType(
public static Block regexpSplit(@SqlType("varchar(x)") Slice source, @SqlType(JoniRegexpType.NAME) JoniRegexp pattern)
{
Matcher matcher = pattern.matcher(source.getBytes());
BlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, 32);
BlockBuilder blockBuilder = VARCHAR.createBlockBuilder(32);

int lastEnd = 0;
int nextStart = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static Block extract(Slice json, JsonPath jsonPath)
if (jsonParser.getCurrentToken() == JsonToken.VALUE_NULL) {
return null;
}
BlockBuilder blockBuilder = ARRAY_TYPE.createBlockBuilder(null, 1);
BlockBuilder blockBuilder = ARRAY_TYPE.createBlockBuilder(1);
append(jsonParser, jsonPath.getScalarExtractor(), blockBuilder);
Block block = blockBuilder.build();
return ARRAY_TYPE.getObject(block, 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public static Block toArray(ArrayType arrayType, BlockBuilderAppender arrayAppen
return null;
}

BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, 1);
BlockBuilder blockBuilder = arrayType.createBlockBuilder(1);
arrayAppender.append(jsonParser, blockBuilder);
if (jsonParser.nextToken() != null) {
throw new JsonCastException(format("Unexpected trailing token: %s", jsonParser.getText()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static SqlMap toMap(MapType mapType, BlockBuilderAppender mapAppender, Co
return null;
}

BlockBuilder blockBuilder = mapType.createBlockBuilder(null, 1);
BlockBuilder blockBuilder = mapType.createBlockBuilder(1);
mapAppender.append(jsonParser, blockBuilder);
if (jsonParser.nextToken() != null) {
throw new JsonCastException(format("Unexpected trailing token: %s", jsonParser.getText()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static SqlRow toRow(
return null;
}

BlockBuilder blockBuilder = rowType.createBlockBuilder(null, 1);
BlockBuilder blockBuilder = rowType.createBlockBuilder(1);
rowAppender.append(jsonParser, blockBuilder);
if (jsonParser.nextToken() != null) {
throw new JsonCastException(format("Unexpected trailing token: %s", jsonParser.getText()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public static SqlMap mapCast(

// Cast the keys into a new block
Type toKeyType = toType.getKeyType();
BlockBuilder keyBlockBuilder = toKeyType.createBlockBuilder(null, size);
BlockBuilder keyBlockBuilder = toKeyType.createBlockBuilder(size);
for (int i = 0; i < size; i++) {
try {
keyProcessFunction.invokeExact(rawKeyBlock, rawOffset + i, session, keyBlockBuilder);
Expand All @@ -268,7 +268,7 @@ public static SqlMap mapCast(

// Cast the values into a new block
Type toValueType = toType.getValueType();
BlockBuilder valueBlockBuilder = toValueType.createBlockBuilder(null, size);
BlockBuilder valueBlockBuilder = toValueType.createBlockBuilder(size);
for (int i = 0; i < size; i++) {
if (rawValueBlock.isNull(rawOffset + i)) {
valueBlockBuilder.appendNull();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private static BlockBuilder createBlockBuilder(Type type, long count)
{
checkCondition(count <= MAX_RESULT_ENTRIES, INVALID_FUNCTION_ARGUMENT, "count argument of repeat function must be less than or equal to 10000");
checkCondition(count >= 0, INVALID_FUNCTION_ARGUMENT, "count argument of repeat function must be greater than or equal to 0");
return type.createBlockBuilder(null, toIntExact(count));
return type.createBlockBuilder(toIntExact(count));
}

private static Block repeatNullValues(BlockBuilder blockBuilder, long count)
Expand Down
Loading
Loading