Skip to content

Commit

Permalink
Update compiler dependency to match release of Neo4j 3.2.13
Browse files Browse the repository at this point in the history
  • Loading branch information
SaschaPeukert committed Oct 30, 2018
1 parent 579cb43 commit e2a6953
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
Expand Up @@ -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}

/**
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Expand Up @@ -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)))
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -45,7 +45,7 @@
<checkstyle.strict>true</checkstyle.strict>
<cypher.compatibility.23>2.3.12</cypher.compatibility.23>
<cypher.compatibility.31>3.1.9</cypher.compatibility.31>
<cypher.compatibility.32>3.2.12</cypher.compatibility.32>
<cypher.compatibility.32>3.2.13</cypher.compatibility.32>
<caffeine.version>2.3.3</caffeine.version>
</properties>

Expand Down

0 comments on commit e2a6953

Please sign in to comment.