Skip to content

Improve performance of PagesIndexComparator for strings #26725

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 2 commits into
base: master
Choose a base branch
from
+32 −6
Open

Improve performance of PagesIndexComparator for strings #26725

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
3b5216c
Improve BenchmarkPagesIndexOrdering
raunaqmorarka Sep 26, 2025
a5f288e
Improve performance of PagesIndexComparator for strings
raunaqmorarka Sep 26, 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
28 changes: 24 additions & 4 deletions core/trino-main/src/test/java/io/trino/operator/BenchmarkPagesIndexOrdering.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
*/
package io.trino.operator;

import io.airlift.slice.Slices;
import io.trino.RowPagesBuilder;
import io.trino.spi.Page;
import io.trino.spi.connector.SortOrder;
import io.trino.spi.type.BigintType;
import io.trino.spi.type.Type;
import io.trino.spi.type.VarcharType;
import org.junit.jupiter.api.Test;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand All @@ -39,6 +42,7 @@
import static io.trino.jmh.Benchmarks.benchmark;
import static io.trino.spi.connector.SortOrder.ASC_NULLS_FIRST;
import static io.trino.spi.type.BigintType.BIGINT;
import static io.trino.spi.type.VarcharType.VARCHAR;
import static java.util.Collections.nCopies;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
Expand All @@ -49,8 +53,8 @@
@OutputTimeUnit(MILLISECONDS)
@BenchmarkMode(AverageTime)
@Fork(2)
@Warmup(iterations = 3)
@Measurement(iterations = 10, time = 2, timeUnit = SECONDS)
@Warmup(iterations = 10, time = 1, timeUnit = SECONDS)
@Measurement(iterations = 10, time = 1, timeUnit = SECONDS)
public class BenchmarkPagesIndexOrdering
{
private static final Random RANDOM = new Random(633969769);
Expand All @@ -62,6 +66,8 @@ public static class Context
{
@Param({"1", "10"})
protected int numberOfChannels = 1;
@Param({"BIGINT", "VARCHAR"})
protected String typeName = "BIGINT";

private List<Type> types;
private List<Integer> sortChannels;
Expand All @@ -71,7 +77,8 @@ public static class Context
@Setup
public void setup()
{
types = nCopies(numberOfChannels, BIGINT);
Type type = getType(typeName);
types = nCopies(numberOfChannels, type);
sortChannels = IntStream.range(0, numberOfChannels).boxed().collect(toImmutableList());
sortOrders = nCopies(numberOfChannels, ASC_NULLS_FIRST);

Expand All @@ -80,14 +87,27 @@ public void setup()
for (int row = 0; row < ROWS_PER_PAGE; row++) {
Object[] values = new Object[numberOfChannels];
for (int channel = 0; channel < numberOfChannels; channel++) {
values[channel] = RANDOM.nextLong();
values[channel] = switch (type) {
case BigintType _ -> RANDOM.nextLong();
case VarcharType _ -> Slices.utf8Slice(String.valueOf(RANDOM.nextLong()));
default -> throw new IllegalArgumentException("Unsupported type: " + typeName);
};
}
pagesBuilder.row(values);
}
pagesBuilder.pageBreak();
}
pages = pagesBuilder.build();
}

private static Type getType(String typeName)
{
return switch (typeName) {
case "BIGINT" -> BIGINT;
case "VARCHAR" -> VARCHAR;
default -> throw new IllegalArgumentException("Unsupported type: " + typeName);
};
}
}

@Benchmark
Expand Down
10 changes: 8 additions & 2 deletions core/trino-spi/src/main/java/io/trino/spi/type/TypeOperators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.FLAT;
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NULL_FLAG;
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.VALUE_BLOCK_POSITION_NOT_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.simpleConvention;
Expand Down Expand Up @@ -496,7 +497,12 @@ private OperatorMethodHandle generateOrderingOperator(OperatorConvention operato
SortOrder sortOrder = operatorConvention.sortOrder().orElseThrow(() -> new IllegalArgumentException("Operator convention does not contain a sort order"));
OperatorType comparisonType = operatorConvention.operatorType();
if (operatorConvention.callingConvention().getArgumentConventions().equals(List.of(BLOCK_POSITION, BLOCK_POSITION))) {
OperatorConvention comparisonOperator = new OperatorConvention(operatorConvention.type(), comparisonType, Optional.empty(), simpleConvention(FAIL_ON_NULL, BLOCK_POSITION, BLOCK_POSITION));
OperatorConvention comparisonOperator = new OperatorConvention(
operatorConvention.type(),
comparisonType,
Optional.empty(),
// null positions are handled separately in adaptBlockPositionComparisonToOrdering and not used in the comparison
simpleConvention(FAIL_ON_NULL, BLOCK_POSITION_NOT_NULL, BLOCK_POSITION_NOT_NULL));
MethodHandle comparisonInvoker = adaptOperator(comparisonOperator);
return adaptBlockPositionComparisonToOrdering(sortOrder, comparisonInvoker);
}
Expand Down Expand Up @@ -538,7 +544,7 @@ private static int getScore(OperatorMethodHandle operatorMethodHandle)
if (argument == NULL_FLAG || argument == FLAT) {
score += 100;
}
else if (argument == BLOCK_POSITION) {
else if (argument == BLOCK_POSITION || argument == VALUE_BLOCK_POSITION_NOT_NULL) {
score += 1;
}
}
Expand Down