Change TranslationMap to use VariableReferenceExpression

prestodb · Jun 11, 2019 · 64d3bec · 64d3bec
1 parent 0628799
commit 64d3bec
Show file tree

Hide file tree

Showing 22 changed files with 193 additions and 213 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
@@ -910,10 +910,10 @@ public PhysicalOperation visitWindow(WindowNode node, LocalExecutionPlanContext
 
                 Frame frame = entry.getValue().getFrame();
                 if (frame.getStartValue().isPresent()) {
-                    frameStartChannel = Optional.of(source.getLayout().get(frame.getStartValue().get()));
+                    frameStartChannel = Optional.of(source.getLayout().get(new Symbol(frame.getStartValue().get().getName())));
                 }
                 if (frame.getEndValue().isPresent()) {
-                    frameEndChannel = Optional.of(source.getLayout().get(frame.getEndValue().get()));
+                    frameEndChannel = Optional.of(source.getLayout().get(new Symbol(frame.getEndValue().get().getName())));
                 }
 
                 FrameInfo frameInfo = new FrameInfo(frame.getType(), frame.getStartType(), frameStartChannel, frame.getEndType(), frameEndChannel);
@@ -2226,7 +2226,7 @@ public PhysicalOperation visitTableWriter(TableWriterNode node, LocalExecutionPl
             }).orElse(new DevNullOperatorFactory(context.getNextOperatorId(), node.getId()));
 
             List<Integer> inputChannels = node.getColumns().stream()
-                    .map(source::symbolToChannel)
+                    .map(source::variableToChannel)
                     .collect(toImmutableList());
 
             OperatorFactory operatorFactory = new TableWriterOperatorFactory(
@@ -2942,10 +2942,11 @@ private static List<Type> toTypes(Map<Symbol, Integer> layout, LocalExecutionPla
                     .collect(toImmutableList());
         }
 
-        public int symbolToChannel(Symbol input)
+        private int variableToChannel(VariableReferenceExpression input)
         {
-            checkArgument(layout.containsKey(input));
+            Symbol symbol = new Symbol(input.getName());
-            return layout.get(input);
+            checkArgument(layout.containsKey(symbol));
+            return layout.get(symbol);
         }
 
         public List<Type> getTypes()

diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/LogicalPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/LogicalPlanner.java
@@ -457,7 +457,7 @@ private RelationPlan createTableWriterPlan(
                     symbolAllocator.newVariable("partialrows", BIGINT),
                     symbolAllocator.newVariable("fragment", VARBINARY),
                     symbolAllocator.newVariable("tablecommitcontext", VARBINARY),
-                    plan.getFieldSymbolMappings(),
+                    plan.getFieldMappings(),
                     columnNames,
                     partitioningScheme,
                     Optional.of(partialAggregation),
@@ -483,7 +483,7 @@ private RelationPlan createTableWriterPlan(
                         symbolAllocator.newVariable("partialrows", BIGINT),
                         symbolAllocator.newVariable("fragment", VARBINARY),
                         symbolAllocator.newVariable("tablecommitcontext", VARBINARY),
-                        plan.getFieldSymbolMappings(),
+                        plan.getFieldMappings(),
                         columnNames,
                         partitioningScheme,
                         Optional.empty(),
@@ -497,7 +497,7 @@ private RelationPlan createTableWriterPlan(
 
     private RelationPlan createDeletePlan(Analysis analysis, Delete node)
     {
-        DeleteNode deleteNode = new QueryPlanner(analysis, symbolAllocator, idAllocator, buildLambdaDeclarationToSymbolMap(analysis, symbolAllocator), metadata, session)
+        DeleteNode deleteNode = new QueryPlanner(analysis, symbolAllocator, idAllocator, buildLambdaDeclarationToVariableMap(analysis, symbolAllocator), metadata, session)
                 .plan(node);
 
         TableFinishNode commitNode = new TableFinishNode(
@@ -536,7 +536,7 @@ private PlanNode createOutputPlan(RelationPlan plan, Analysis analysis)
 
     private RelationPlan createRelationPlan(Analysis analysis, Query query)
     {
-        return new RelationPlanner(analysis, symbolAllocator, idAllocator, buildLambdaDeclarationToSymbolMap(analysis, symbolAllocator), metadata, session)
+        return new RelationPlanner(analysis, symbolAllocator, idAllocator, buildLambdaDeclarationToVariableMap(analysis, symbolAllocator), metadata, session)
                 .process(query, null);
     }
 
@@ -568,9 +568,9 @@ private static List<ColumnMetadata> getOutputTableColumns(RelationPlan plan, Opt
         return columns.build();
     }
 
-    private static Map<NodeRef<LambdaArgumentDeclaration>, Symbol> buildLambdaDeclarationToSymbolMap(Analysis analysis, SymbolAllocator symbolAllocator)
+    private static Map<NodeRef<LambdaArgumentDeclaration>, VariableReferenceExpression> buildLambdaDeclarationToVariableMap(Analysis analysis, SymbolAllocator symbolAllocator)
     {
-        Map<NodeRef<LambdaArgumentDeclaration>, Symbol> resultMap = new LinkedHashMap<>();
+        Map<NodeRef<LambdaArgumentDeclaration>, VariableReferenceExpression> resultMap = new LinkedHashMap<>();
         for (Entry<NodeRef<Expression>, Type> entry : analysis.getTypes().entrySet()) {
             if (!(entry.getKey().getNode() instanceof LambdaArgumentDeclaration)) {
                 continue;
@@ -579,7 +579,7 @@ private static Map<NodeRef<LambdaArgumentDeclaration>, Symbol> buildLambdaDeclar
             if (resultMap.containsKey(lambdaArgumentDeclaration)) {
                 continue;
             }
-            resultMap.put(lambdaArgumentDeclaration, symbolAllocator.newSymbol(lambdaArgumentDeclaration.getNode(), entry.getValue()));
+            resultMap.put(lambdaArgumentDeclaration, symbolAllocator.newVariable(lambdaArgumentDeclaration.getNode(), entry.getValue()));
         }
         return resultMap;
     }

diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanBuilder.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanBuilder.java
@@ -46,7 +46,7 @@ public PlanBuilder(TranslationMap translations, PlanNode root, List<Expression>
 
     public TranslationMap copyTranslations()
     {
-        TranslationMap translations = new TranslationMap(getRelationPlan(), getAnalysis(), getTranslations().getLambdaDeclarationToSymbolMap());
+        TranslationMap translations = new TranslationMap(getRelationPlan(), getAnalysis(), getTranslations().getLambdaDeclarationToVariableMap());
         translations.copyMappingsFrom(getTranslations());
         return translations;
     }
@@ -76,14 +76,14 @@ public boolean canTranslate(Expression expression)
         return translations.containsSymbol(expression);
     }
 
-    public Symbol translate(Expression expression)
+    public VariableReferenceExpression translate(Expression expression)
     {
         return translations.get(expression);
     }
 
     public VariableReferenceExpression translateToVariable(Expression expression)
     {
-        return translations.getVariable(expression);
+        return translations.get(expression);
     }
 
     public Expression rewrite(Expression expression)
@@ -107,14 +107,14 @@ public PlanBuilder appendProjections(Iterable<Expression> expressions, SymbolAll
             projections.put(symbolAllocator.toVariableReference(symbol), symbol.toSymbolReference());
         }
 
-        ImmutableMap.Builder<Symbol, Expression> newTranslations = ImmutableMap.builder();
+        ImmutableMap.Builder<VariableReferenceExpression, Expression> newTranslations = ImmutableMap.builder();
         for (Expression expression : expressions) {
             VariableReferenceExpression variable = symbolAllocator.newVariable(expression, getAnalysis().getTypeWithCoercions(expression));
             projections.put(variable, translations.rewrite(expression));
-            newTranslations.put(new Symbol(variable.getName()), expression);
+            newTranslations.put(variable, expression);
         }
         // Now append the new translations into the TranslationMap
-        for (Map.Entry<Symbol, Expression> entry : newTranslations.build().entrySet()) {
+        for (Map.Entry<VariableReferenceExpression, Expression> entry : newTranslations.build().entrySet()) {
             translations.put(entry.getValue(), entry.getKey());
         }
 

diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanFragmenter.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanFragmenter.java
@@ -724,7 +724,7 @@ private TableFinishNode createTemporaryTableWrite(
                                             symbolAllocator.newVariable("partialrows", BIGINT),
                                             symbolAllocator.newVariable("fragment", VARBINARY),
                                             symbolAllocator.newVariable("tablecommitcontext", VARBINARY),
-                                            outputs.stream().map(VariableReferenceExpression::getName).map(Symbol::new).collect(toImmutableList()),
+                                            outputs,
                                             outputColumnNames,
                                             Optional.of(new PartitioningScheme(
                                                     Partitioning.create(partitioningHandle, partitioningVariables),