From f975f3f408dee4da7fe7c811212918f287b35dd8 Mon Sep 17 00:00:00 2001 From: Wenlei Xie Date: Wed, 29 Jul 2020 16:47:09 -0700 Subject: [PATCH] [Test Only] Remove allFragments from PlanPrinter#formatFragment --- .../sql/planner/planPrinter/PlanPrinter.java | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanPrinter.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanPrinter.java index 443a9167a4f5a..021a91341b785 100644 --- a/presto-main/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanPrinter.java +++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/planPrinter/PlanPrinter.java @@ -227,13 +227,15 @@ public static String textDistributedPlan(StageInfo outputStageInfo, FunctionMana { StringBuilder builder = new StringBuilder(); List allStages = getAllStages(Optional.of(outputStageInfo)); - List allFragments = allStages.stream() - .map(StageInfo::getPlan) - .map(Optional::get) - .collect(toImmutableList()); Map 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(); @@ -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(); @@ -296,7 +304,13 @@ private static String formatJsonFragmentList(List fragments) return new JsonRenderer().render(fragmentJsonMap.build()); } - private static String formatFragment(FunctionManager functionManager, Session session, PlanFragment fragment, Optional stageInfo, Optional> planNodeStats, boolean verbose, List allFragments) + private static String formatFragment( + FunctionManager functionManager, + Session session, + PlanFragment fragment, + Optional stageInfo, + Optional> planNodeStats, + boolean verbose) { StringBuilder builder = new StringBuilder(); builder.append(format("Fragment %s [%s]\n", @@ -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();