From e2a6953035668783e20e61d39cf5deb1b4ad5cf0 Mon Sep 17 00:00:00 2001 From: Sascha Peukert Date: Wed, 17 Oct 2018 15:34:37 +0200 Subject: [PATCH] Update compiler dependency to match release of Neo4j 3.2.13 --- .../acceptance/NodeIndexSeekAcceptanceTest.scala | 10 +++------- .../PatternComprehensionAcceptanceTest.scala | 3 +-- pom.xml | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/NodeIndexSeekAcceptanceTest.scala b/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/NodeIndexSeekAcceptanceTest.scala index 640315654619..e85102c20bf7 100644 --- a/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/NodeIndexSeekAcceptanceTest.scala +++ b/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/NodeIndexSeekAcceptanceTest.scala @@ -19,7 +19,7 @@ */ package org.neo4j.internal.cypher.acceptance -import org.neo4j.cypher.{ExecutionEngineFunSuite} +import org.neo4j.cypher.ExecutionEngineFunSuite import org.neo4j.internal.cypher.acceptance.CypherComparisonSupport.{ComparePlansWithAssertion, Configs} /** @@ -366,9 +366,7 @@ class NodeIndexSeekAcceptanceTest extends ExecutionEngineFunSuite with CypherCom // When val result = executeWith(Configs.CommunityInterpreted, "MATCH (n:Label1:Label2) WHERE n.prop1 = 'val' OR n.prop2 = 'val' RETURN n", planComparisonStrategy = ComparePlansWithAssertion(_ should useOperatorTimes("NodeIndexSeek", 2), - expectPlansToFail = Configs.Cost2_3 + Configs.Cost3_1 + Configs.AllRulePlanners), - //TODO: Remove when 3.2.13 is released - expectedDifferentResults = Configs.Version3_2) + expectPlansToFail = Configs.Cost2_3 + Configs.Cost3_1 + Configs.AllRulePlanners)) // Then result.toList should be (empty) @@ -405,9 +403,7 @@ class NodeIndexSeekAcceptanceTest extends ExecutionEngineFunSuite with CypherCom // When val result = executeWith(Configs.CommunityInterpreted, "MATCH (n:Label1:Label2) WHERE n.prop1 = 'val' OR n.prop2 = 'val' RETURN n", planComparisonStrategy = ComparePlansWithAssertion(_ should useOperatorTimes("NodeIndexSeek", 4), - expectPlansToFail = Configs.Cost2_3 + Configs.Cost3_1 + Configs.AllRulePlanners), - //TODO: Remove when 3.2.13 is released - expectedDifferentResults = Configs.Version3_2) + expectPlansToFail = Configs.Cost2_3 + Configs.Cost3_1 + Configs.AllRulePlanners)) // Then result.toList should be (empty) diff --git a/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/PatternComprehensionAcceptanceTest.scala b/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/PatternComprehensionAcceptanceTest.scala index a5dfffe61cd8..e647814822a8 100644 --- a/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/PatternComprehensionAcceptanceTest.scala +++ b/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/PatternComprehensionAcceptanceTest.scala @@ -503,8 +503,7 @@ class PatternComprehensionAcceptanceTest extends ExecutionEngineFunSuite with Cy graph.execute(setup) val res = executeWith(Configs.CommunityInterpreted - Configs.Version2_3 - Configs.AllRulePlanners, query, - // TODO remove this for 3.2 after depending on 3.2.13 - expectedDifferentResults = Configs.Version3_2 + Configs.Version3_1) + expectedDifferentResults = Configs.Version3_1) // If the (b)-->(:C) does not get correctly evaluated, this will be two instead res.toList should equal(List(Map("arraySize" -> 1))) } diff --git a/pom.xml b/pom.xml index fb26705e3989..9c3d90c12cdc 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ true 2.3.12 3.1.9 - 3.2.12 + 3.2.13 2.3.3