Change PlanPrinter to use FunctionRegistry instead of Metadata

presto-main/src/main/java/com/facebook/presto/operator/ExplainAnalyzeOperator.java

@@ -19,7 +19,7 @@
 import com.facebook.presto.execution.QueryPerformanceFetcher;
 import com.facebook.presto.execution.StageId;
 import com.facebook.presto.execution.StageInfo;
-import com.facebook.presto.metadata.Metadata;
+import com.facebook.presto.metadata.FunctionRegistry;
 import com.facebook.presto.spi.Page;
 import com.facebook.presto.spi.block.BlockBuilder;
 import com.facebook.presto.spi.block.BlockBuilderStatus;
@@ -44,7 +44,7 @@ public static class ExplainAnalyzeOperatorFactory
         private final int operatorId;
         private final PlanNodeId planNodeId;
         private final QueryPerformanceFetcher queryPerformanceFetcher;
-        private final Metadata metadata;
+        private final FunctionRegistry functionRegistry;
         private final StatsCalculator statsCalculator;
         private final CostCalculator costCalculator;
         private final boolean verbose;
@@ -54,15 +54,15 @@ public ExplainAnalyzeOperatorFactory(
                 int operatorId,
                 PlanNodeId planNodeId,
                 QueryPerformanceFetcher queryPerformanceFetcher,
-                Metadata metadata,
+                FunctionRegistry functionRegistry,
                 StatsCalculator statsCalculator,
                 CostCalculator costCalculator,
                 boolean verbose)
         {
             this.operatorId = operatorId;
             this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
             this.queryPerformanceFetcher = requireNonNull(queryPerformanceFetcher, "queryPerformanceFetcher is null");
-            this.metadata = requireNonNull(metadata, "metadata is null");
+            this.functionRegistry = requireNonNull(functionRegistry, "functionRegistry is null");
             this.statsCalculator = requireNonNull(statsCalculator, "statsCalculator is null");
             this.costCalculator = requireNonNull(costCalculator, "costCalculator is null");
             this.verbose = verbose;
@@ -79,7 +79,7 @@ public Operator createOperator(DriverContext driverContext)
         {
             checkState(!closed, "Factory is already closed");
             OperatorContext operatorContext = driverContext.addOperatorContext(operatorId, planNodeId, ExplainAnalyzeOperator.class.getSimpleName());
-            return new ExplainAnalyzeOperator(operatorContext, queryPerformanceFetcher, metadata, statsCalculator, costCalculator, verbose);
+            return new ExplainAnalyzeOperator(operatorContext, queryPerformanceFetcher, functionRegistry, statsCalculator, costCalculator, verbose);
         }
 
         @Override
@@ -91,13 +91,13 @@ public void noMoreOperators()
         @Override
         public OperatorFactory duplicate()
         {
-            return new ExplainAnalyzeOperatorFactory(operatorId, planNodeId, queryPerformanceFetcher, metadata, statsCalculator, costCalculator, verbose);
+            return new ExplainAnalyzeOperatorFactory(operatorId, planNodeId, queryPerformanceFetcher, functionRegistry, statsCalculator, costCalculator, verbose);
         }
     }
 
     private final OperatorContext operatorContext;
     private final QueryPerformanceFetcher queryPerformanceFetcher;
-    private final Metadata metadata;
+    private final FunctionRegistry functionRegistry;
     private final StatsCalculator statsCalculator;
     private final CostCalculator costCalculator;
     private final boolean verbose;
@@ -107,14 +107,14 @@ public OperatorFactory duplicate()
     public ExplainAnalyzeOperator(
             OperatorContext operatorContext,
             QueryPerformanceFetcher queryPerformanceFetcher,
-            Metadata metadata,
+            FunctionRegistry functionRegistry,
             StatsCalculator statsCalculator,
             CostCalculator costCalculator,
             boolean verbose)
     {
         this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
         this.queryPerformanceFetcher = requireNonNull(queryPerformanceFetcher, "queryPerformanceFetcher is null");
-        this.metadata = requireNonNull(metadata, "metadata is null");
+        this.functionRegistry = requireNonNull(functionRegistry, "functionRegistry is null");
         this.statsCalculator = requireNonNull(statsCalculator, "statsCalculator is null");
         this.costCalculator = requireNonNull(costCalculator, "costCalculator is null");
         this.verbose = verbose;
@@ -172,7 +172,7 @@ public Page getOutput()
             return null;
         }
 
-        String plan = textDistributedPlan(queryInfo.getOutputStage().get(), metadata, statsCalculator, costCalculator, operatorContext.getSession(), verbose);
+        String plan = textDistributedPlan(queryInfo.getOutputStage().get(), functionRegistry, statsCalculator, costCalculator, operatorContext.getSession(), verbose);
         BlockBuilder builder = VARCHAR.createBlockBuilder(new BlockBuilderStatus(), 1);
         VARCHAR.writeString(builder, plan);
 

presto-main/src/main/java/com/facebook/presto/sql/analyzer/QueryExplainer.java

@@ -111,17 +111,17 @@ public String getPlan(Session session, Statement statement, Type planType, List<
         switch (planType) {
             case LOGICAL:
                 Plan plan = getLogicalPlan(session, statement, parameters);
-                return PlanPrinter.textLogicalPlan(plan.getRoot(), plan.getTypes(), metadata, statsCalculator, costCalculator, session);
+                return PlanPrinter.textLogicalPlan(plan.getRoot(), plan.getTypes(), metadata.getFunctionRegistry(), statsCalculator, costCalculator, session);
             case DISTRIBUTED:
                 SubPlan subPlan = getDistributedPlan(session, statement, parameters);
-                return PlanPrinter.textDistributedPlan(subPlan, metadata, statsCalculator, costCalculator, session);
+                return PlanPrinter.textDistributedPlan(subPlan, metadata.getFunctionRegistry(), statsCalculator, costCalculator, session);
         }
         throw new IllegalArgumentException("Unhandled plan type: " + planType);
     }
 
     public String getPlan(PlanFragment fragment, Session session)
     {
-        return PlanPrinter.textPlanFragment(fragment, metadata, statsCalculator, costCalculator, session);
+        return PlanPrinter.textPlanFragment(fragment, metadata.getFunctionRegistry(), statsCalculator, costCalculator, session);
     }
 
     private static <T extends Statement> String explainTask(Statement statement, DataDefinitionTask<T> task, List<Expression> parameters)

presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java

@@ -684,7 +684,7 @@ public PhysicalOperation visitExplainAnalyze(ExplainAnalyzeNode node, LocalExecu
                     context.getNextOperatorId(),
                     node.getId(),
                     queryPerformanceFetcher.get(),
-                    metadata,
+                    metadata.getFunctionRegistry(),
                     statsCalculator,
                     costCalculator,
                     node.isVerbose());