Skip to content

Use pre-order stages ordering in EXPLAN output #26655

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −7
Draft

Use pre-order stages ordering in EXPLAN output #26655

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
10 changes: 4 additions & 6 deletions core/trino-main/src/main/java/io/trino/operator/ExplainAnalyzeOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.util.concurrent.TimeUnit;

import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static io.trino.spi.type.VarcharType.VARCHAR;
import static io.trino.sql.planner.planprinter.PlanPrinter.textDistributedPlan;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -153,15 +152,14 @@ public Page getOutput()

QueryInfo queryInfo = queryPerformanceFetcher.getQueryInfo(operatorContext.getDriverContext().getTaskId().getQueryId());
checkState(queryInfo.getStages().isPresent(), "Stages informations is missing");
checkState(queryInfo.getStages().get().getOutputStage().getSubStages().size() == 1, "Expected one sub stage of explain node");
StagesInfo stagesInfo = queryInfo.getStages().get();
checkState(stagesInfo.getOutputStage().getSubStages().size() == 1, "Expected one sub stage of explain node");

if (!hasFinalStageInfo(queryInfo.getStages().get())) {
if (!hasFinalStageInfo(stagesInfo)) {
return null;
}

List<StageInfo> stagesWithoutOutputStage = queryInfo.getStages().orElseThrow().getStages().stream()
.filter(stage -> !stage.getStageId().equals(queryInfo.getStages().orElseThrow().getOutputStageId()))
.collect(toImmutableList());
List<StageInfo> stagesWithoutOutputStage = stagesInfo.getSubStagesDeepPreOrder(stagesInfo.getOutputStageId(), false);

String plan = textDistributedPlan(
stagesWithoutOutputStage,
Expand Down
2 changes: 1 addition & 1 deletion core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ public static String textDistributedPlan(
Anonymizer anonymizer,
NodeVersion version)
{
return textDistributedPlan(stages.getStages(), queryStats, valuePrinter, verbose, anonymizer, version);
return textDistributedPlan(stages.getSubStagesDeepPreOrder(stages.getOutputStageId(), true), queryStats, valuePrinter, verbose, anonymizer, version);
}

public static String textDistributedPlan(
Expand Down