Skip to content

Commit eec9391

Browse files
committed
Add 5.0.0-drop09.0 compat layer
1 parent 2185cee commit eec9391

File tree

8 files changed

+33
-3
lines changed

8 files changed

+33
-3
lines changed

cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryNodeCursorTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ protected GraphStore graphStore() {
6666
@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
6767
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
6868
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
69+
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
6970
void shouldScanSingle() {
7071
nodeCursor.single(0);
7172
assertThat(nodeCursor.next()).isTrue();
@@ -76,6 +77,7 @@ void shouldScanSingle() {
7677
@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
7778
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
7879
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
80+
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
7981
void shouldScanRange() {
8082
nodeCursor.scanRange(1, 2);
8183
nodeCursor.next();
@@ -89,6 +91,7 @@ void shouldScanRange() {
8991
@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
9092
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
9193
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
94+
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
9295
void shouldScanAll() {
9396
nodeCursor.scan();
9497
graphStore.nodes().forEachNode(nodeId -> {
@@ -103,6 +106,7 @@ void shouldScanAll() {
103106
@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
104107
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
105108
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
109+
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
106110
void testLabels() {
107111
graphStore.nodes().forEachNode(nodeId -> {
108112
nodeCursor.single(nodeId);
@@ -128,6 +132,7 @@ void shouldHaveProperties43() {
128132
@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
129133
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
130134
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
135+
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
131136
void shouldHaveProperties() {
132137
nodeCursor.next();
133138
assertThat(nodeCursor.hasProperties()).isTrue();
@@ -138,6 +143,7 @@ void shouldHaveProperties() {
138143
@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
139144
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
140145
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
146+
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
141147
void shouldTraverseProperties() throws TokenNotFoundException {
142148
nodeCursor.next();
143149
var propertyCursor = StorageEngineProxy.inMemoryNodePropertyCursor(graphStore, tokenHolders);

cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipScanCursorTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
4444
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
4545
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
46+
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
4647
public class InMemoryRelationshipScanCursorTest extends CypherTest {
4748

4849
@Neo4jGraph

cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipTraversalCursorTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
4747
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
4848
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
49+
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
4950
class InMemoryRelationshipTraversalCursorTest extends CypherTest {
5051

5152
@Neo4jGraph

cypher/cypher-test/src/test/java/org/neo4j/internal/recordstorage/InMemoryStorageEngineTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
@DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
3939
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
4040
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
41+
@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
4142
class InMemoryStorageEngineTest extends CypherTest {
4243

4344
@Neo4jGraph

cypher/unsupported/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/unsupported/StorageEngineProxyFactoryImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public class StorageEngineProxyFactoryImpl implements StorageEngineProxyFactory
3333
private static final Collection<Neo4jVersion> incompatibleVersions = EnumSet.of(
3434
Neo4jVersion.V_4_4_9_drop10,
3535
Neo4jVersion.V_5_0_drop60,
36-
Neo4jVersion.V_5_0_drop80
36+
Neo4jVersion.V_5_0_drop80,
37+
Neo4jVersion.V_5_0_drop90
3738
);
3839

3940
@Override

neo4j-adapter/src/main/java/org/neo4j/gds/compat/Neo4jVersion.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public enum Neo4jVersion {
3131
V_4_4_9_drop10,
3232
V_4_4_10_drop10,
3333
V_5_0_drop60,
34-
V_5_0_drop80;
34+
V_5_0_drop80,
35+
V_5_0_drop90;
3536

3637
@Override
3738
public String toString() {
@@ -48,6 +49,8 @@ public String toString() {
4849
return "5.0.0-drop06.0";
4950
case V_5_0_drop80:
5051
return "5.0.0-drop08.0";
52+
case V_5_0_drop90:
53+
return "5.0.0-drop09.0";
5154
default:
5255
throw new IllegalArgumentException("Unexpected value: " + this.name() + " (sad java 😞)");
5356
}
@@ -98,6 +101,10 @@ static Neo4jVersion parse(String version) {
98101
return Neo4jVersion.V_5_0_drop80;
99102
}
100103

104+
if ("5.0.0-drop09.0".equals(version)) {
105+
return Neo4jVersion.V_5_0_drop90;
106+
}
107+
101108
var majorVersion = Pattern.compile("[.-]")
102109
.splitAsStream(version)
103110
.limit(2)

neo4j-adapter/src/test/java/org/neo4j/gds/compat/Neo4jVersionTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class Neo4jVersionTest {
4141
"4.4.10-drop01.0, V_4_4_10_drop10",
4242
"5.0.0-drop06.0, V_5_0_drop60",
4343
"5.0.0-drop08.0, V_5_0_drop80",
44+
"5.0.0-drop09.0, V_5_0_drop90",
4445
})
4546
void testParse(String input, Neo4jVersion expected) {
4647
assertEquals(expected.name(), Neo4jVersion.parse(input).name());

proc/sysinfo/src/test/java/org/neo4j/gds/SysInfoProcTest.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,20 @@ class SysInfoProcTest extends BaseProcTest {
5151
"Neo4j Settings 4.x",
5252
"Neo4j Settings 5.0.0-drop06.0 (placeholder)",
5353
"Neo4j Settings 5.0.0-drop08.0 (placeholder)",
54+
"Neo4j Settings 5.0.0-drop09.0 (placeholder)",
5455
"Neo4j Settings 5.0.0-drop06.0",
5556
"Neo4j Settings 5.0.0-drop08.0",
57+
"Neo4j Settings 5.0.0-drop09.0",
5658
"Neo4j 4.3",
5759
"Neo4j 4.4",
5860
"Neo4j 4.4.9-drop01.0",
5961
"Neo4j 4.4.10-drop01.0",
6062
"Neo4j 5.0.0-drop06.0 (placeholder)",
6163
"Neo4j 5.0.0-drop08.0 (placeholder)",
64+
"Neo4j 5.0.0-drop09.0 (placeholder)",
6265
"Neo4j 5.0.0-drop06.0",
63-
"Neo4j 5.0.0-drop08.0"
66+
"Neo4j 5.0.0-drop08.0",
67+
"Neo4j 5.0.0-drop09.0",
6468
);
6569

6670
@BeforeEach
@@ -137,6 +141,14 @@ void testSysInfoProc() throws IOException {
137141
"Neo4j 5.0.0-drop08.0"
138142
);
139143
break;
144+
case V_5_0_drop90:
145+
expectedCompatibilities = Set.of(
146+
"Neo4j Settings 5.0.0-drop09.0 (placeholder)",
147+
"Neo4j Settings 5.0.0-drop09.0",
148+
"Neo4j 5.0.0-drop09.0 (placeholder)",
149+
"Neo4j 5.0.0-drop09.0"
150+
);
151+
break;
140152
default:
141153
throw new IllegalStateException("Unexpected Neo4j version: " + neo4jVersion);
142154
}

0 commit comments

Comments
 (0)