Skip to content

Remove unnecessary usage of SimplePagesHashStrategy #26273

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
Jul 25, 2025
Merged

Remove unnecessary usage of SimplePagesHashStrategy #26273

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
32 changes: 3 additions & 29 deletions core/trino-main/src/main/java/io/trino/operator/PagesIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import java.util.Map;
import java.util.Optional;
import java.util.OptionalDouble;
import java.util.OptionalInt;
import java.util.function.Supplier;
import java.util.stream.IntStream;
import java.util.stream.Stream;
Expand Down Expand Up @@ -526,40 +525,15 @@ public LookupSourceSupplier createLookupSourceSupplier(
HashArraySizeSupplier hashArraySizeSupplier)
{
List<ObjectArrayList<Block>> channels = ImmutableList.copyOf(this.channels);
if (!joinChannels.isEmpty()) {
// todo compiled implementation of lookup join does not support when we are joining with empty join channels.
// This code path will trigger only for OUTER joins. To fix that we need to add support for
// OUTER joins into NestedLoopsJoin and remove "type == INNER" condition in LocalExecutionPlanner.visitJoin()

LookupSourceSupplierFactory lookupSourceFactory = joinCompiler.compileLookupSourceFactory(types, joinChannels, sortChannel, outputChannels);
return lookupSourceFactory.createLookupSourceSupplier(
session,
valueAddresses,
channels,
filterFunctionFactory,
sortChannel,
searchFunctionFactories,
hashArraySizeSupplier);
}

PagesHashStrategy hashStrategy = new SimplePagesHashStrategy(
types,
outputChannels.orElseGet(() -> rangeList(types.size())),
channels,
joinChannels,
sortChannel,
blockTypeOperators);

return new JoinHashSupplier(
LookupSourceSupplierFactory lookupSourceFactory = joinCompiler.compileLookupSourceFactory(types, joinChannels, sortChannel, outputChannels);
return lookupSourceFactory.createLookupSourceSupplier(
session,
hashStrategy,
valueAddresses,
channels,
filterFunctionFactory,
sortChannel,
searchFunctionFactories,
hashArraySizeSupplier,
OptionalInt.empty());
hashArraySizeSupplier);
}

private static List<Integer> rangeList(int endExclusive)
Expand Down
30 changes: 30 additions & 0 deletions core/trino-main/src/test/java/io/trino/sql/gen/TestJoinCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,36 @@ public class TestJoinCompiler
private final BlockTypeOperators blockTypeOperators = new BlockTypeOperators(typeOperators);
private final JoinCompiler joinCompiler = new JoinCompiler(typeOperators);

@Test
void testEmptyChannels()
{
// compile hash strategy with empty join channels
PagesHashStrategyFactory pagesHashStrategyFactory = joinCompiler.compilePagesHashStrategyFactory(ImmutableList.of(BIGINT), ImmutableList.of());

// create hash strategy with a single channel blocks
ObjectArrayList<Block> channel = new ObjectArrayList<>();
channel.add(BlockAssertions.createStringSequenceBlock(10, 20));
channel.add(BlockAssertions.createStringSequenceBlock(20, 30));
channel.add(BlockAssertions.createStringSequenceBlock(15, 25));

List<ObjectArrayList<Block>> channels = ImmutableList.of(channel);
PagesHashStrategy hashStrategy = pagesHashStrategyFactory.createPagesHashStrategy(channels);

assertThat(hashStrategy.getChannelCount()).isEqualTo(1);
assertThat(hashStrategy.getSizeInBytes()).isGreaterThan(0L);
assertThat(hashStrategy.hashRow(0, new Page(channel.get(0)))).isEqualTo(0L);
assertThat(hashStrategy.hashPosition(0, 5)).isEqualTo(0L);
assertThat(hashStrategy.positionEqualsPositionIgnoreNulls(0, 5, 0, 5)).isTrue();
assertThat(hashStrategy.positionEqualsPosition(0, 5, 0, 5)).isTrue();
assertThat(hashStrategy.positionIdenticalToPosition(0, 5, 0, 5)).isTrue();
assertThat(hashStrategy.positionEqualsRow(0, 5, 5, new Page(channel.get(0)))).isTrue();
assertThat(hashStrategy.positionIdenticalToRow(0, 5, 5, new Page(channel.get(0)))).isTrue();
assertThat(hashStrategy.rowEqualsRow(5, new Page(channel.get(0)), 5, new Page(channel.get(0)))).isTrue();
assertThat(hashStrategy.rowIdenticalToRow(5, new Page(channel.get(0)), 5, new Page(channel.get(0)))).isTrue();
assertThat(hashStrategy.positionEqualsRowIgnoreNulls(0, 5, 5, new Page(channel.get(0)))).isTrue();
assertThat(hashStrategy.positionEqualsPositionIgnoreNulls(0, 5, 0, 5)).isTrue();
}

@Test
public void testSingleChannel()
{
Expand Down