Fixes from code review

neo4j · Aug 23, 2018 · 2d893f8 · 2d893f8
1 parent 78c3a35
commit 2d893f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/...org/neo4j/cypher/internal/runtime/interpreted/commands/convert/ExpressionConverters.scala b/...org/neo4j/cypher/internal/runtime/interpreted/commands/convert/ExpressionConverters.scala
@@ -63,12 +63,6 @@ class ExpressionConverters(converters: ExpressionConverter*) {
     throw new InternalException(s"Unknown projection type during transformation ($projections)")
   }
 
-  //ctx.setRefAt(1,map.get("foo"))
-  //ctx.setRefAt(4,map.get("bar"))
-  //ctx.setRefAt(5,map.get("baz"))
-  //ctx.setRefAt(6,map.get("foo"))
-  //ctx.setRefAt(42,map.get("foo"))
-
   def toCommandPredicate(id: Id, in: ast.Expression): Predicate = in match {
     case e: ast.PatternExpression => predicates.NonEmpty(toCommandExpression(id, e))
     case e: ast.FilterExpression => predicates.NonEmpty(toCommandExpression(id, e))

diff --git a/...a/org/neo4j/cypher/internal/runtime/compiled/expressions/IntermediateCodeGeneration.scala b/...a/org/neo4j/cypher/internal/runtime/compiled/expressions/IntermediateCodeGeneration.scala
@@ -456,8 +456,8 @@ class IntermediateCodeGeneration(slots: SlotConfiguration) {
                                             constant(name)))
       Some(IntermediateExpression(load(parameterVariable), Seq.empty, Seq(local), Set(equal(load(parameterVariable), noValue))))
 
-    case Property(mapExpression, PropertyKeyName(key)) =>
-      for (map <- compileExpression(mapExpression)) yield {
+    case Property(targetExpression, PropertyKeyName(key)) =>
+      for (map <- compileExpression(targetExpression)) yield {
         val variableName = namer.nextVariableName()
         val local = variable[AnyValue](variableName,
                                     ternary(map.nullCheck.reduceLeft((acc,current) => or(acc, current)), noValue,
@@ -1006,7 +1006,6 @@ class IntermediateCodeGeneration(slots: SlotConfiguration) {
       }
 
     case p =>
-      println(p)
       None
   }