Skip to content

Make exception message more descriptive #25560

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
Apr 14, 2025
Merged

Make exception message more descriptive #25560

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
9 changes: 7 additions & 2 deletions ...c/main/java/io/trino/execution/scheduler/faulttolerant/HashDistributionSplitAssigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import io.trino.spi.HostAddress;
import io.trino.spi.connector.CatalogHandle;
import io.trino.sql.planner.PlanFragment;
import io.trino.sql.planner.plan.PlanFragmentId;
import io.trino.sql.planner.plan.PlanNode;
import io.trino.sql.planner.plan.PlanNodeId;
import io.trino.sql.planner.plan.PlanVisitor;
Expand Down Expand Up @@ -54,6 +55,7 @@
class HashDistributionSplitAssigner
implements SplitAssigner
{
private final PlanFragmentId fragmentId;
private final Optional<CatalogHandle> catalogRequirement;
private final Set<PlanNodeId> replicatedSources;
private final Set<PlanNodeId> allSources;
Expand Down Expand Up @@ -83,6 +85,7 @@ public static HashDistributionSplitAssigner create(
"fragments using scale-writers partitioning are expected to have exactly one remote source and no table scans");
}
return new HashDistributionSplitAssigner(
fragment.getId(),
catalogRequirement,
partitionedSources,
replicatedSources,
Expand All @@ -101,12 +104,14 @@ public static HashDistributionSplitAssigner create(

@VisibleForTesting
HashDistributionSplitAssigner(
PlanFragmentId fragmentId,
Optional<CatalogHandle> catalogRequirement,
Set<PlanNodeId> partitionedSources,
Set<PlanNodeId> replicatedSources,
FaultTolerantPartitioningScheme sourcePartitioningScheme,
Map<Integer, TaskPartition> sourcePartitionToTaskPartition)
{
this.fragmentId = requireNonNull(fragmentId, "fragmentId is null");
this.catalogRequirement = requireNonNull(catalogRequirement, "catalogRequirement is null");
this.replicatedSources = ImmutableSet.copyOf(requireNonNull(replicatedSources, "replicatedSources is null"));
this.allSources = ImmutableSet.<PlanNodeId>builder()
Expand All @@ -127,7 +132,7 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
int nextTaskPartitionId = 0;
for (int sourcePartitionId = 0; sourcePartitionId < sourcePartitioningScheme.getPartitionCount(); sourcePartitionId++) {
TaskPartition taskPartition = sourcePartitionToTaskPartition.get(sourcePartitionId);
verify(taskPartition != null, "taskPartition not found for sourcePartitionId: %s", sourcePartitionId);
verify(taskPartition != null, "taskPartition not found for fragment %s plan node %s for sourcePartitionId %s", fragmentId, planNodeId, sourcePartitionId);

for (SubPartition subPartition : taskPartition.getSubPartitions()) {
if (!subPartition.isIdAssigned()) {
Expand Down Expand Up @@ -156,7 +161,7 @@ public AssignmentResult assign(PlanNodeId planNodeId, ListMultimap<Integer, Spli
else {
splits.forEach((sourcePartitionId, split) -> {
TaskPartition taskPartition = sourcePartitionToTaskPartition.get(sourcePartitionId);
verify(taskPartition != null, "taskPartition not found for sourcePartitionId: %s", sourcePartitionId);
verify(taskPartition != null, "taskPartition not found for fragment %s plan node %s for sourcePartitionId %s", fragmentId, planNodeId, sourcePartitionId);

List<SubPartition> subPartitions;
if (taskPartition.getSplitBy().isPresent() && taskPartition.getSplitBy().get().equals(planNodeId)) {
Expand Down
2 changes: 2 additions & 0 deletions ...st/java/io/trino/execution/scheduler/faulttolerant/TestHashDistributionSplitAssigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import io.trino.execution.scheduler.faulttolerant.HashDistributionSplitAssigner.TaskPartition;
import io.trino.metadata.InternalNode;
import io.trino.metadata.Split;
import io.trino.sql.planner.plan.PlanFragmentId;
import io.trino.sql.planner.plan.PlanNodeId;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -720,6 +721,7 @@ public void run()
splittableSources::contains,
mergeAllowed);
HashDistributionSplitAssigner assigner = new HashDistributionSplitAssigner(
new PlanFragmentId("fragment"),
Optional.of(TEST_CATALOG_HANDLE),
partitionedSources,
replicatedSources,
Expand Down
Loading