Update cypher compiler dependencies to 3.3.3

neo4j · Feb 14, 2018 · 994b9cf · 994b9cf
1 parent 30dbf66
commit 994b9cf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/community/cypher/cypher/pom.xml b/community/cypher/cypher/pom.xml
@@ -217,7 +217,7 @@
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-cypher-compiler-3.3</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.3</version>
       <exclusions>
         <exclusion>
           <groupId>org.neo4j</groupId>

diff --git a/...uite/src/test/scala/org/neo4j/internal/cypher/acceptance/EagerizationAcceptanceTest.scala b/...uite/src/test/scala/org/neo4j/internal/cypher/acceptance/EagerizationAcceptanceTest.scala
@@ -2771,8 +2771,7 @@ class EagerizationAcceptanceTest
         |RETURN size(tags) as nbrTags
       """.stripMargin
 
-    // Fixed in 3.3.3
-    val nonBugFixedConfig = Configs.Version3_3 + Configs.Cost3_1
+    val nonBugFixedConfig = Configs.Cost3_1
 
     val result = executeWith(Configs.UpdateConf - Configs.AllRulePlanners, query,
       planComparisonStrategy = testEagerPlanComparisonStrategy(1, nonBugFixedConfig),
@@ -2794,8 +2793,7 @@ class EagerizationAcceptanceTest
         |RETURN COUNT(t.value) as nbrTags
       """.stripMargin
 
-    // Fixed in 3.3.3
-    val nonBugFixedConfig = Configs.Version3_3 + Configs.Cost3_1 + Configs.AllRulePlanners
+    val nonBugFixedConfig = Configs.Cost3_1 + Configs.AllRulePlanners
 
     val result = executeWith(Configs.UpdateConf, query,
       planComparisonStrategy = testEagerPlanComparisonStrategy(2, nonBugFixedConfig),

diff --git a/...e-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/HintAcceptanceTest.scala b/...e-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/HintAcceptanceTest.scala
@@ -44,10 +44,11 @@ class HintAcceptanceTest
                   |USING JOIN ON a
                   |RETURN a.name, b.name""".stripMargin
 
-    executeWith(Configs.Interpreted - Configs.Cost2_3 - Configs.Cost3_1, query, planComparisonStrategy = ComparePlansWithAssertion((p) => {
+    executeWith(Configs.Interpreted + Configs.Version3_3 - Configs.Cost2_3 - Configs.Cost3_1, query,
+      planComparisonStrategy = ComparePlansWithAssertion((p) => {
       p should useOperators("NodeLeftOuterHashJoin")
       p should not(useOperators("NodeHashJoin"))
-    }, expectPlansToFail = Configs.AllRulePlanners + Configs.BackwardsCompatibility))
+    }, expectPlansToFail = Configs.OldAndRule))
   }
 
   test("should not plan multiple joins for one hint - right outer join") {

diff --git a/...e-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/MiscAcceptanceTest.scala b/...e-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/MiscAcceptanceTest.scala
@@ -46,8 +46,7 @@ class MiscAcceptanceTest extends ExecutionEngineFunSuite with CypherComparisonSu
         |ORDER BY y
       """.stripMargin
 
-    // Fixed in 3.3.3
-    val result = executeWith(Configs.All, query, expectedDifferentResults = Configs.BackwardsCompatibility + Configs.AllRulePlanners)
+    val result = executeWith(Configs.All, query, expectedDifferentResults = Configs.OldAndRule)
     result.toList should equal(List(Map("y" -> 1, "y3" -> 3), Map("y" -> 1, "y3" -> 4), Map("y" -> 2, "y3" -> 3), Map("y" -> 2, "y3" -> 4)))
   }
 

diff --git a/...spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/RemoveAcceptanceTest.scala b/...spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/RemoveAcceptanceTest.scala
@@ -34,8 +34,7 @@ class RemoveAcceptanceTest extends ExecutionEngineFunSuite with QueryStatisticsT
         |REMOVE CASE WHEN a.age>b.age THEN a ELSE b END.age
         |RETURN a.age, b.age""".stripMargin
 
-    // Fixed in 3.3.3
-    val result = executeWith(Configs.UpdateConf - Configs.Version3_3 - Configs.Cost3_1, query)
+    val result = executeWith(Configs.UpdateConf - Configs.Cost3_1, query)
 
     // then
     result.toList should equal(List(Map("a.age" -> 23, "b.age" -> null)))