Skip to content

Minor fixes in local scale writer #14781

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
sopel39 merged 2 commits into from
Oct 27, 2022
Merged

Minor fixes in local scale writer #14781

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
0479a84
Fix bug in finding local scaling exchange node
gaurav8297 Sep 26, 2022
9e7d62d
Pass partition channel types directly to LocalExchange
gaurav8297 Sep 27, 2022
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
6 changes: 1 addition & 5 deletions core/trino-main/src/main/java/io/trino/operator/exchange/LocalExchange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public LocalExchange(
int defaultConcurrency,
PartitioningHandle partitioning,
List<Integer> partitionChannels,
List<Type> types,
List<Type> partitionChannelTypes,
Optional<Integer> partitionHashChannel,
DataSize maxBufferedBytes,
BlockTypeOperators blockTypeOperators,
Expand All @@ -106,10 +106,6 @@ public LocalExchange(
.map(buffer -> (Consumer<PageReference>) buffer::addPage)
.collect(toImmutableList());

List<Type> partitionChannelTypes = partitionChannels.stream()
.map(types::get)
.collect(toImmutableList());

this.memoryManager = new LocalExchangeMemoryManager(maxBufferedBytes.toBytes());
if (partitioning.equals(SINGLE_DISTRIBUTION)) {
exchangerSupplier = () -> new BroadcastExchanger(buffers, memoryManager);
Expand Down
13 changes: 8 additions & 5 deletions core/trino-main/src/main/java/io/trino/sql/planner/LocalExecutionPlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3501,7 +3501,7 @@ public PhysicalOperation visitExchange(ExchangeNode node, LocalExecutionPlanCont
private boolean isLocalScaledWriterExchange(PlanNode node)
{
Optional<PlanNode> result = searchFrom(node)
.where(planNode -> node instanceof ExchangeNode && ((ExchangeNode) node).getScope() == LOCAL)
.where(planNode -> planNode instanceof ExchangeNode && ((ExchangeNode) planNode).getScope() == LOCAL)
.findFirst();

return result.isPresent()
Expand Down Expand Up @@ -3529,7 +3529,7 @@ private PhysicalOperation createLocalMerge(ExchangeNode node, LocalExecutionPlan
operatorsCount,
node.getPartitioningScheme().getPartitioning().getHandle(),
ImmutableList.of(),
types,
ImmutableList.of(),
Optional.empty(),
maxLocalExchangeBufferSize,
blockTypeOperators,
Expand Down Expand Up @@ -3583,11 +3583,14 @@ else if (context.getDriverInstanceCount().isPresent()) {
}

List<Type> types = getSourceOperatorTypes(node, context.getTypes());
List<Integer> channels = node.getPartitioningScheme().getPartitioning().getArguments().stream()
List<Integer> partitionChannels = node.getPartitioningScheme().getPartitioning().getArguments().stream()
.map(argument -> node.getOutputSymbols().indexOf(argument.getColumn()))
.collect(toImmutableList());
Optional<Integer> hashChannel = node.getPartitioningScheme().getHashColumn()
.map(symbol -> node.getOutputSymbols().indexOf(symbol));
List<Type> partitionChannelTypes = partitionChannels.stream()
.map(types::get)
.collect(toImmutableList());

List<DriverFactoryParameters> driverFactoryParametersList = new ArrayList<>();
for (int i = 0; i < node.getSources().size(); i++) {
Expand All @@ -3603,8 +3606,8 @@ else if (context.getDriverInstanceCount().isPresent()) {
session,
driverInstanceCount,
node.getPartitioningScheme().getPartitioning().getHandle(),
channels,
types,
partitionChannels,
partitionChannelTypes,
hashChannel,
maxLocalExchangeBufferSize,
blockTypeOperators,
Expand Down
22 changes: 10 additions & 12 deletions core/trino-main/src/test/java/io/trino/operator/exchange/TestLocalExchange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public void testGatherSingleWriter()
8,
SINGLE_DISTRIBUTION,
ImmutableList.of(),
TYPES,
ImmutableList.of(),
Optional.empty(),
DataSize.ofBytes(retainedSizeOfPages(99)),
TYPE_OPERATOR_FACTORY,
Expand Down Expand Up @@ -185,7 +185,7 @@ public void testBroadcast()
2,
FIXED_BROADCAST_DISTRIBUTION,
ImmutableList.of(),
TYPES,
ImmutableList.of(),
Optional.empty(),
LOCAL_EXCHANGE_MAX_BUFFERED_BYTES,
TYPE_OPERATOR_FACTORY,
Expand Down Expand Up @@ -274,7 +274,7 @@ public void testRandom()
2,
FIXED_ARBITRARY_DISTRIBUTION,
ImmutableList.of(),
TYPES,
ImmutableList.of(),
Optional.empty(),
LOCAL_EXCHANGE_MAX_BUFFERED_BYTES,
TYPE_OPERATOR_FACTORY,
Expand Down Expand Up @@ -325,7 +325,7 @@ public void testScaleWriter()
3,
SCALED_WRITER_DISTRIBUTION,
ImmutableList.of(),
TYPES,
ImmutableList.of(),
Optional.empty(),
DataSize.ofBytes(retainedSizeOfPages(4)),
TYPE_OPERATOR_FACTORY,
Expand Down Expand Up @@ -406,7 +406,7 @@ public void testNoWriterScalingWhenOnlyBufferSizeLimitIsExceeded()
3,
SCALED_WRITER_DISTRIBUTION,
ImmutableList.of(),
TYPES,
ImmutableList.of(),
Optional.empty(),
DataSize.ofBytes(retainedSizeOfPages(4)),
TYPE_OPERATOR_FACTORY,
Expand Down Expand Up @@ -449,7 +449,7 @@ public void testNoWriterScalingWhenOnlyWriterMinSizeLimitIsExceeded()
3,
SCALED_WRITER_DISTRIBUTION,
ImmutableList.of(),
TYPES,
ImmutableList.of(),
Optional.empty(),
DataSize.ofBytes(retainedSizeOfPages(20)),
TYPE_OPERATOR_FACTORY,
Expand Down Expand Up @@ -493,7 +493,7 @@ public void testPassthrough()
2,
FIXED_PASSTHROUGH_DISTRIBUTION,
ImmutableList.of(),
TYPES,
ImmutableList.of(),
Optional.empty(),
DataSize.ofBytes(retainedSizeOfPages(1)),
TYPE_OPERATOR_FACTORY,
Expand Down Expand Up @@ -658,7 +658,7 @@ public BucketFunction getBucketFunction(ConnectorTransactionHandle transactionHa
2,
partitioningHandle,
ImmutableList.of(1),
types,
ImmutableList.of(BIGINT),
Optional.empty(),
LOCAL_EXCHANGE_MAX_BUFFERED_BYTES,
TYPE_OPERATOR_FACTORY,
Expand Down Expand Up @@ -704,15 +704,13 @@ public BucketFunction getBucketFunction(ConnectorTransactionHandle transactionHa
@Test
public void writeUnblockWhenAllReadersFinish()
{
ImmutableList<Type> types = ImmutableList.of(BIGINT);

LocalExchange localExchange = new LocalExchange(
nodePartitioningManager,
SESSION,
2,
FIXED_BROADCAST_DISTRIBUTION,
ImmutableList.of(),
types,
ImmutableList.of(),
Optional.empty(),
LOCAL_EXCHANGE_MAX_BUFFERED_BYTES,
TYPE_OPERATOR_FACTORY,
Expand Down Expand Up @@ -760,7 +758,7 @@ public void writeUnblockWhenAllReadersFinishAndPagesConsumed()
2,
FIXED_BROADCAST_DISTRIBUTION,
ImmutableList.of(),
TYPES,
ImmutableList.of(),
Optional.empty(),
DataSize.ofBytes(1),
TYPE_OPERATOR_FACTORY,
Expand Down
6 changes: 5 additions & 1 deletion core/trino-main/src/test/java/io/trino/operator/join/JoinTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,17 @@ public static BuildSideSetup setupBuildSide(

int partitionCount = parallelBuild ? PARTITION_COUNT : 1;
List<Integer> hashChannels = buildPages.getHashChannels().orElseThrow();
List<Type> types = buildPages.getTypes();
List<Type> hashChannelTypes = hashChannels.stream()
.map(types::get)
.collect(toImmutableList());
LocalExchange localExchange = new LocalExchange(
nodePartitioningManager,
taskContext.getSession(),
partitionCount,
FIXED_HASH_DISTRIBUTION,
hashChannels,
buildPages.getTypes(),
hashChannelTypes,
buildPages.getHashChannel(),
DataSize.of(32, DataSize.Unit.MEGABYTE),
TYPE_OPERATOR_FACTORY,
Expand Down
7 changes: 6 additions & 1 deletion core/trino-main/src/test/java/io/trino/operator/join/unspilled/JoinTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.trino.operator.join.unspilled.HashBuilderOperator.HashBuilderOperatorFactory;
import io.trino.spi.Page;
import io.trino.spi.TrinoException;
import io.trino.spi.type.Type;
import io.trino.spi.type.TypeOperators;
import io.trino.sql.gen.JoinFilterFunctionCompiler;
import io.trino.sql.planner.NodePartitioningManager;
Expand Down Expand Up @@ -136,13 +137,17 @@ public static BuildSideSetup setupBuildSide(

int partitionCount = parallelBuild ? PARTITION_COUNT : 1;
List<Integer> hashChannels = buildPages.getHashChannels().orElseThrow();
List<Type> types = buildPages.getTypes();
List<Type> hashChannelTypes = hashChannels.stream()
.map(types::get)
.collect(toImmutableList());
LocalExchange localExchange = new LocalExchange(
nodePartitioningManager,
taskContext.getSession(),
partitionCount,
FIXED_HASH_DISTRIBUTION,
hashChannels,
buildPages.getTypes(),
hashChannelTypes,
buildPages.getHashChannel(),
DataSize.of(32, DataSize.Unit.MEGABYTE),
TYPE_OPERATOR_FACTORY,
Expand Down