Skip to content

Remove allFragments from PlanPrinter#formatFragment #14924

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
wenleix merged 1 commit into from
Jul 30, 2020
Merged

Remove allFragments from PlanPrinter#formatFragment #14924

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
45 changes: 33 additions & 12 deletions presto-main/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,15 @@ public static String textDistributedPlan(StageInfo outputStageInfo, FunctionMana
{
StringBuilder builder = new StringBuilder();
List<StageInfo> allStages = getAllStages(Optional.of(outputStageInfo));
List<PlanFragment> allFragments = allStages.stream()
.map(StageInfo::getPlan)
.map(Optional::get)
.collect(toImmutableList());
Map<PlanNodeId, PlanNodeStats> aggregatedStats = aggregateStageStats(allStages);
for (StageInfo stageInfo : allStages) {
builder.append(formatFragment(functionManager, session, stageInfo.getPlan().get(), Optional.of(stageInfo), Optional.of(aggregatedStats), verbose, allFragments));
builder.append(formatFragment(
functionManager,
session,
stageInfo.getPlan().get(),
Optional.of(stageInfo),
Optional.of(aggregatedStats),
verbose));
}

return builder.toString();
Expand All @@ -243,7 +245,13 @@ public static String textDistributedPlan(SubPlan plan, FunctionManager functionM
{
StringBuilder builder = new StringBuilder();
for (PlanFragment fragment : plan.getAllFragments()) {
builder.append(formatFragment(functionManager, session, fragment, Optional.empty(), Optional.empty(), verbose, plan.getAllFragments()));
builder.append(formatFragment(
functionManager,
session,
fragment,
Optional.empty(),
Optional.empty(),
verbose));
}

return builder.toString();
Expand Down Expand Up @@ -296,7 +304,13 @@ private static String formatJsonFragmentList(List<PlanFragment> fragments)
return new JsonRenderer().render(fragmentJsonMap.build());
}

private static String formatFragment(FunctionManager functionManager, Session session, PlanFragment fragment, Optional<StageInfo> stageInfo, Optional<Map<PlanNodeId, PlanNodeStats>> planNodeStats, boolean verbose, List<PlanFragment> allFragments)
private static String formatFragment(
FunctionManager functionManager,
Session session,
PlanFragment fragment,
Optional<StageInfo> stageInfo,
Optional<Map<PlanNodeId, PlanNodeStats>> planNodeStats,
boolean verbose)
{
StringBuilder builder = new StringBuilder();
builder.append(format("Fragment %s [%s]\n",
Expand Down Expand Up @@ -344,11 +358,18 @@ private static String formatFragment(FunctionManager functionManager, Session se
}
builder.append(indentString(1)).append(format("Stage Execution Strategy: %s\n", fragment.getStageExecutionDescriptor().getStageExecutionStrategy()));

TypeProvider typeProvider = TypeProvider.fromVariables(allFragments.stream()
.flatMap(f -> f.getVariables().stream())
.distinct()
.collect(toImmutableList()));
builder.append(textLogicalPlan(fragment.getRoot(), typeProvider, Optional.of(fragment.getStageExecutionDescriptor()), functionManager, fragment.getStatsAndCosts(), session, planNodeStats, 1, verbose))
TypeProvider typeProvider = TypeProvider.fromVariables(fragment.getVariables());
builder.append(
textLogicalPlan(
fragment.getRoot(),
typeProvider,
Optional.of(fragment.getStageExecutionDescriptor()),
functionManager,
fragment.getStatsAndCosts(),
session,
planNodeStats,
1,
verbose))
.append("\n");

return builder.toString();
Expand Down