Skip to content

Commit 18ac737

Browse files
committed
Add Neo4jVersion for 5.18
1 parent 9942caf commit 18ac737

File tree

6 files changed

+25
-7
lines changed

6 files changed

+25
-7
lines changed

compatibility/5.18/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_518/Neo4jProxyFactoryImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public final class Neo4jProxyFactoryImpl implements Neo4jProxyFactory {
2929

3030
@Override
3131
public boolean canLoad(Neo4jVersion version) {
32-
return version == Neo4jVersion.V_RC;
32+
return version == Neo4jVersion.V_5_18;
3333
}
3434

3535
@Override
@@ -39,6 +39,6 @@ public Neo4jProxyApi load() {
3939

4040
@Override
4141
public String description() {
42-
return "Neo4j RC";
42+
return "Neo4j 5.18";
4343
}
4444
}

compatibility/5.18/storage-engine-adapter/src/main/java17/org/neo4j/gds/compat/_518/InMemoryStorageEngineFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public class InMemoryStorageEngineFactory implements StorageEngineFactory {
120120
static final String IN_MEMORY_STORAGE_ENGINE_NAME = "in-memory-518";
121121

122122
public InMemoryStorageEngineFactory() {
123-
StorageEngineProxyApi.requireNeo4jVersion(Neo4jVersion.V_RC, StorageEngineFactory.class);
123+
StorageEngineProxyApi.requireNeo4jVersion(Neo4jVersion.V_5_18, StorageEngineFactory.class);
124124
}
125125

126126
@Override

compatibility/5.18/storage-engine-adapter/src/main/java17/org/neo4j/gds/compat/_518/StorageEngineProxyFactoryImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class StorageEngineProxyFactoryImpl implements StorageEngineProxyFactory
2929

3030
@Override
3131
public boolean canLoad(Neo4jVersion version) {
32-
return version == Neo4jVersion.V_RC;
32+
return version == Neo4jVersion.V_5_18;
3333
}
3434

3535
@Override
@@ -39,6 +39,6 @@ public StorageEngineProxyApi load() {
3939

4040
@Override
4141
public String description() {
42-
return "Storage Engine RC";
42+
return "Storage Engine 5.18";
4343
}
4444
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ public enum Neo4jVersion {
3535
V_5_15,
3636
V_5_16,
3737
V_5_17,
38+
V_5_18,
3839
V_RC;
3940

40-
private static final int MINOR_DEV_VERSION = 18;
41+
private static final int MINOR_DEV_VERSION = 19;
4142

4243
static Neo4jVersion parse(String version) {
4344
var versionSegments = Pattern.compile("[.-]")
@@ -76,6 +77,8 @@ static Neo4jVersion parse(String version) {
7677
return Neo4jVersion.V_5_16;
7778
case 17:
7879
return Neo4jVersion.V_5_17;
80+
case 18:
81+
return Neo4jVersion.V_5_18;
7982
default:
8083
if (minorVersion >= MINOR_DEV_VERSION) {
8184
return Neo4jVersion.V_RC;
@@ -148,6 +151,8 @@ public String toString() {
148151
return "5.16";
149152
case V_5_17:
150153
return "5.17";
154+
case V_5_18:
155+
return "5.18";
151156
case V_RC:
152157
return "dev";
153158
default:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ class Neo4jVersionTest {
4545
"5.15.0, V_5_15",
4646
"5.16.0, V_5_16",
4747
"5.17.0, V_5_17",
48-
"5.18.0, V_RC",
48+
"5.18.0, V_5_18",
49+
"5.19.0, V_RC",
4950
})
5051
void testParse(String input, Neo4jVersion expected) {
5152
assertEquals(expected.name(), Neo4jVersion.parse(input).name());
@@ -93,6 +94,7 @@ void shouldNotRespectVersionOverride() {
9394
"5.15.0, 5, 15",
9495
"5.16.0, 5, 16",
9596
"5.17.0, 5, 17",
97+
"5.18.0, 5, 18",
9698
}
9799
)
98100
void semanticVersion(String input, int expectedMajor, int expectedMinor) {

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ class SysInfoProcTest extends BaseProcTest {
7878
"Neo4j 5.17",
7979
"Neo4j 5.17 (placeholder)",
8080

81+
"Neo4j 5.18",
82+
"Neo4j 5.18 (placeholder)",
83+
8184
"Neo4j DEV",
8285
"Neo4j DEV (placeholder)",
8386

@@ -190,6 +193,14 @@ void testSysInfoProc() throws IOException {
190193
"Neo4j 5.17"
191194
);
192195
break;
196+
case V_5_18:
197+
expectedCompatibilities = Set.of(
198+
"Neo4j Settings 5.x (placeholder)",
199+
"Neo4j Settings 5.x",
200+
"Neo4j 5.18 (placeholder)",
201+
"Neo4j 5.18"
202+
);
203+
break;
193204
case V_RC:
194205
expectedCompatibilities = Set.of(
195206
"Neo4j Settings 5.x",

0 commit comments

Comments
 (0)