Update Cypher compiler dependency to 3.3.2

IdName and FullPruningVarExpand were removed in 3.3.2

community/cypher/cypher/pom.xml

@@ -232,7 +232,7 @@
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-cypher-compiler-3.3</artifactId>
-      <version>3.3.1</version>
+      <version>3.3.2</version>
       <exclusions>
         <exclusion>
           <groupId>org.neo4j</groupId>

community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/LogicalPlanConverter.scala

@@ -26,7 +26,6 @@ import org.neo4j.cypher.internal.planner.v3_4.spi.PlanningAttributes.{Cardinalit
 import org.neo4j.cypher.internal.frontend.v3_3.ast.{Expression => ExpressionV3_3}
 import org.neo4j.cypher.internal.frontend.v3_3.{InputPosition => InputPositionV3_3, SemanticDirection => SemanticDirectionV3_3, ast => astV3_3, symbols => symbolsV3_3}
 import org.neo4j.cypher.internal.frontend.{v3_3 => frontendV3_3}
-import org.neo4j.cypher.internal.ir.v3_3.{IdName => IdNameV3_3}
 import org.neo4j.cypher.internal.ir.{v3_3 => irV3_3, v3_4 => irV3_4}
 import org.neo4j.cypher.internal.util.v3_4.Rewritable.RewritableAny
 import org.neo4j.cypher.internal.util.v3_4.{symbols => symbolsV3_4, _}
@@ -77,17 +76,6 @@ object LogicalPlanConverter {
             targetId = children(4).asInstanceOf[String])(SameId(Id(plan.assignedId.underlying)))
         case (plan: plansV3_3.ProceduralLogicalPlan, children: Seq[AnyRef]) =>
           convertVersion("v3_3", "v3_4", plan, children, procedureOrSchemaIdGen, classOf[IdGen])
-        case (plan: plansV3_3.FullPruningVarExpand, children: Seq[AnyRef]) => // Remove when we update to 3.3.2
-          plansV3_4.PruningVarExpand(
-            children(0).asInstanceOf[LogicalPlanV3_4],
-            plan.from.name,
-            children(2).asInstanceOf[expressionsV3_4.SemanticDirection],
-            children(3).asInstanceOf[Seq[expressionsV3_4.RelTypeName]],
-            plan.to.name,
-            plan.minLength,
-            plan.maxLength,
-            children.last.asInstanceOf[Seq[(expressionsV3_4.LogicalVariable,expressionsV3_4.Expression)]]
-          )(SameId(Id(plan.assignedId.underlying)))
         case (plan: plansV3_3.LogicalPlan, children: Seq[AnyRef]) =>
           convertVersion("v3_3", "v3_4", plan, children, SameId(Id(plan.assignedId.underlying)), classOf[IdGen])
 
@@ -106,8 +94,6 @@ object LogicalPlanConverter {
           convertVersion("v3_3", "v3_4", item, children, helpers.as3_4(item.asInstanceOf[astV3_3.ASTNode].position), classOf[InputPosition])
         case (expressionV3_3: astV3_3.ASTNode, children: Seq[AnyRef]) =>
           convertVersion("frontend.v3_3.ast", "v3_4.expressions", expressionV3_3, children, helpers.as3_4(expressionV3_3.position), classOf[InputPosition])
-        case (IdNameV3_3(name), _) => name
-
         case (symbolsV3_3.CTAny, _) => symbolsV3_4.CTAny
         case (symbolsV3_3.CTBoolean, _) => symbolsV3_4.CTBoolean
         case (symbolsV3_3.CTFloat, _) => symbolsV3_4.CTFloat

community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compatibility/v3_3/LogicalPlanConverterTest.scala

@@ -25,7 +25,6 @@ import org.neo4j.cypher.internal.frontend.v3_3.{InputPosition => InputPositionV3
 import org.neo4j.cypher.internal.frontend.v3_4.{ast => astV3_4}
 import org.neo4j.cypher.internal.frontend.{v3_3 => frontendV3_3}
 import org.neo4j.cypher.internal.compiler.{v3_3 => compilerV3_3}
-import org.neo4j.cypher.internal.ir.v3_3.{IdName => IdNameV3_3}
 import org.neo4j.cypher.internal.ir.{v3_3 => irV3_3, v3_4 => irV3_4}
 import org.neo4j.cypher.internal.util.v3_4.attribution.SequentialIdGen
 import org.neo4j.cypher.internal.util.v3_4.{InputPosition, NonEmptyList, symbols => symbolsV3_4}
@@ -195,7 +194,7 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
     def isImportant(expression: astV3_3.Expression): Boolean = false
 
     val var3_3 = astV3_3.Variable("n")(pos3_3)
-    val a3_3 = plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved3_3)
+    val a3_3 = plansV3_3.AllNodesScan("n", Set.empty)(solved3_3)
     val l3_3 = plansV3_3.Limit(a3_3, var3_3, plansV3_3.IncludeTies)(solved3_3)
     l3_3.assignIds()
 
@@ -207,7 +206,7 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
     def isImportant(expression: astV3_3.Expression): Boolean = true
 
     val var3_3 = astV3_3.Variable("n")(pos3_3)
-    val a3_3 = plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved3_3)
+    val a3_3 = plansV3_3.AllNodesScan("n", Set.empty)(solved3_3)
     val l3_3 = plansV3_3.Limit(a3_3, var3_3, plansV3_3.IncludeTies)(solved3_3)
     l3_3.assignIds()
 
@@ -222,7 +221,7 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
 
     val var3_3a = astV3_3.Variable("n")(InputPositionV3_3(0, 0, 0))
     val var3_3b = astV3_3.Variable("n")(InputPositionV3_3(1, 1, 1))
-    val a3_3 = plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved3_3)
+    val a3_3 = plansV3_3.AllNodesScan("n", Set.empty)(solved3_3)
     val l3_3a = plansV3_3.Limit(a3_3, var3_3a, plansV3_3.IncludeTies)(solved3_3)
     val l3_3b = plansV3_3.Limit(l3_3a, var3_3b, plansV3_3.IncludeTies)(solved3_3)
     l3_3b.assignIds()
@@ -236,7 +235,7 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
 
   test("should provide minimal implementation of solved after plan conversion") {
     val solved = irV3_3.CardinalityEstimation.lift(irV3_3.PlannerQuery.empty, irV3_3.Cardinality(5.0))
-    val a3_3 = plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved)
+    val a3_3 = plansV3_3.AllNodesScan("n", Set.empty)(solved)
     a3_3.assignIds()
 
     val solveds = new Solveds
@@ -247,7 +246,7 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
   }
 
   test("should convert AllNodeScan and keep id") {
-    val a3_3 = plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved3_3)
+    val a3_3 = plansV3_3.AllNodesScan("n", Set.empty)(solved3_3)
     a3_3.assignIds()
     val id3_3 = a3_3.assignedId
     val a3_4 = plansV3_4.AllNodesScan("n", Set.empty)
@@ -258,7 +257,7 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
   }
 
   test("should convert Aggregation and keep ids") {
-    val a3_3 = plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved3_3)
+    val a3_3 = plansV3_3.AllNodesScan("n", Set.empty)(solved3_3)
     val i3_3a = astV3_3.SignedDecimalIntegerLiteral("2")(pos3_3)
     val i3_3b = astV3_3.SignedDecimalIntegerLiteral("5")(pos3_3)
     val ag3_3 = plansV3_3.Aggregation(a3_3, Map("a" -> i3_3a), Map("b" -> i3_3b))(solved3_3)
@@ -295,7 +294,7 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
   }
 
   test("should convert ErrorPlan") {
-    val a3_3 = plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved3_3)
+    val a3_3 = plansV3_3.AllNodesScan("n", Set.empty)(solved3_3)
     val e3_3 = plansV3_3.ErrorPlan(a3_3, new frontendV3_3.ExhaustiveShortestPathForbiddenException)(solved3_3)
     e3_3.assignIds()
 
@@ -309,8 +308,8 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
 
   test("should convert NodeIndexSeek") {
     val var3_3 = astV3_3.Variable("n")(pos3_3)
-    val a3_3 = plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved3_3)
-    val n3_3 = plansV3_3.NodeIndexSeek(IdNameV3_3("a"),
+    val a3_3 = plansV3_3.AllNodesScan("n", Set.empty)(solved3_3)
+    val n3_3 = plansV3_3.NodeIndexSeek("a",
       astV3_3.LabelToken("b", frontendV3_3.LabelId(2)),
       Seq(astV3_3.PropertyKeyToken("c", frontendV3_3.PropertyKeyId(3))),
       plansV3_3.ScanQueryExpression(var3_3), Set.empty)(solved3_3)
@@ -328,7 +327,7 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
 
   test("should convert ProcedureCall") {
     val var3_3 = astV3_3.Variable("n")(pos3_3)
-    val a3_3 = plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved3_3)
+    val a3_3 = plansV3_3.AllNodesScan("n", Set.empty)(solved3_3)
     val inputv3_3 = plansV3_3.FieldSignature("d", symbolsV3_3.CTString, Some(plansV3_3.CypherValue("e", symbolsV3_3.CTString)))
     val sigv3_3 = plansV3_3.ProcedureSignature(plansV3_3.QualifiedName(Seq("a", "b"), "c"), IndexedSeq(inputv3_3), None, None, plansV3_3.ProcedureReadWriteAccess(Array("foo", "bar")))
     val pres3_3 = astV3_3.ProcedureResultItem(Some(astV3_3.ProcedureOutput("f")(pos3_3)), var3_3)(pos3_3)
@@ -349,8 +348,8 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
   }
 
   test("should convert Sort") {
-    val a3_3 = plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved3_3)
-    val s3_3 = plansV3_3.Sort(a3_3, Seq(plansV3_3.Ascending(IdNameV3_3("n"))))(solved3_3)
+    val a3_3 = plansV3_3.AllNodesScan("n", Set.empty)(solved3_3)
+    val s3_3 = plansV3_3.Sort(a3_3, Seq(plansV3_3.Ascending("n")))(solved3_3)
     s3_3.assignIds()
 
     val a3_4 = plansV3_4.AllNodesScan("n", Set.empty)
@@ -441,10 +440,10 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
       case "InequalitySeekRange" => compilerV3_3.RangeGreaterThan(frontendV3_3.helpers.NonEmptyList(frontendV3_3.InclusiveBound(variable)))
       case "PrefixRange" => compilerV3_3.PrefixRange(variable)
 
-      case "LogicalPlan" => plansV3_3.AllNodesScan(IdNameV3_3("n"), Set.empty)(solved3_3)
+      case "LogicalPlan" => plansV3_3.AllNodesScan("n", Set.empty)(solved3_3)
       case "PlannerQuery" => solved3_3
       case "Exception" => new frontendV3_3.ExhaustiveShortestPathForbiddenException
-      case "IdName" => IdNameV3_3("n")
+      case "IdName" => "n"
       case "LabelName" => astV3_3.LabelName("n")(pos3_3)
       case "LabelToken" => astV3_3.LabelToken("a", argumentProvider(classOf[frontendV3_3.LabelId]))
       case "LabelId" => frontendV3_3.LabelId(5)
@@ -459,7 +458,7 @@ class LogicalPlanConverterTest extends FunSuite with Matchers {
       case "SeekableArgs" => plansV3_3.SingleSeekableArg(variable)
       case "ExpansionMode" => plansV3_3.ExpandAll
       case "ShortestPathPattern" => irV3_3.ShortestPathPattern(None, argumentProvider(classOf[irV3_3.PatternRelationship]), single = true)(argumentProvider(classOf[astV3_3.ShortestPaths]))
-      case "PatternRelationship" => irV3_3.PatternRelationship(IdNameV3_3("n"), (IdNameV3_3("n"), IdNameV3_3("n")), frontendV3_3.SemanticDirection.OUTGOING, Seq.empty, irV3_3.SimplePatternLength)
+      case "PatternRelationship" => irV3_3.PatternRelationship("n", ("n", "n"), frontendV3_3.SemanticDirection.OUTGOING, Seq.empty, irV3_3.SimplePatternLength)
       case "PatternLength" => irV3_3.SimplePatternLength
       case "Ties" => plansV3_3.IncludeTies
       case "CSVFormat" => irV3_3.HasHeaders

enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/MergeNodeAcceptanceTest.scala

@@ -63,7 +63,7 @@ class MergeNodeAcceptanceTest extends ExecutionEngineFunSuite with QueryStatisti
 
   private val supportMerge = Configs.Interpreted - Configs.Cost2_3
   // TODO: Change this setting when the bugfix #10771 merged to earlier 3.x versions is included as a dependency
-  private val doNotYetHaveBugFix = Configs.Cost3_1 + TestScenario(Versions.V3_3, Planners.Cost, Runtimes.Default)
+  private val doNotYetHaveBugFix = Configs.Cost3_1
 
   test("Merging with self loop and relationship uniqueness") {
     graph.execute("CREATE (a) CREATE (a)-[:X]->(a)")