Add Neo4jVersion.513 and use it

neo4j · Oct 23, 2023 · a556791 · a556791
1 parent ccade71
commit a556791
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 49 deletions.
diff --git a/...neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_513/SettingProxyFactoryImpl.java b/...neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_513/SettingProxyFactoryImpl.java
diff --git a/...neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_513/Neo4jProxyFactoryImpl.java b/...neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_513/Neo4jProxyFactoryImpl.java
@@ -29,7 +29,7 @@ public final class Neo4jProxyFactoryImpl implements Neo4jProxyFactory {
 
     @Override
     public boolean canLoad(Neo4jVersion version) {
-        return version == Neo4jVersion.V_Dev;
+        return version == Neo4jVersion.V_5_13;
     }
 
     @Override

diff --git a/...ngine-adapter/src/main/java17/org/neo4j/gds/compat/_513/InMemoryStorageEngineFactory.java b/...ngine-adapter/src/main/java17/org/neo4j/gds/compat/_513/InMemoryStorageEngineFactory.java
@@ -119,7 +119,7 @@ public class InMemoryStorageEngineFactory implements StorageEngineFactory {
     static final String IN_MEMORY_STORAGE_ENGINE_NAME = "in-memory-513";
 
     public InMemoryStorageEngineFactory() {
-        StorageEngineProxyApi.requireNeo4jVersion(Neo4jVersion.V_Dev, StorageEngineFactory.class);
+        StorageEngineProxyApi.requireNeo4jVersion(Neo4jVersion.V_5_13, StorageEngineFactory.class);
     }
 
     @Override

diff --git a/...gine-adapter/src/main/java17/org/neo4j/gds/compat/_513/StorageEngineProxyFactoryImpl.java b/...gine-adapter/src/main/java17/org/neo4j/gds/compat/_513/StorageEngineProxyFactoryImpl.java
@@ -29,7 +29,7 @@ public class StorageEngineProxyFactoryImpl implements StorageEngineProxyFactory
 
     @Override
     public boolean canLoad(Neo4jVersion version) {
-        return version == Neo4jVersion.V_Dev;
+        return version == Neo4jVersion.V_5_13;
     }
 
     @Override

diff --git a/neo4j-adapter/src/main/java/org/neo4j/gds/compat/Neo4jVersion.java b/neo4j-adapter/src/main/java/org/neo4j/gds/compat/Neo4jVersion.java
@@ -40,9 +40,10 @@ public enum Neo4jVersion {
     V_5_10,
     V_5_11,
     V_5_12,
+    V_5_13,
     V_Dev;
 
-    private static final int MINOR_DEV_VERSION = 10;
+    private static final int MINOR_DEV_VERSION = 14;
 
     @Override
     public String toString() {
@@ -63,6 +64,8 @@ public String toString() {
                 return "5.11";
             case V_5_12:
                 return "5.12";
+            case V_5_13:
+                return "5.13";
             case V_Dev:
                 return "dev";
             default:
@@ -150,6 +153,8 @@ static Neo4jVersion parse(String version) {
                     return Neo4jVersion.V_5_11;
                 case 12:
                     return Neo4jVersion.V_5_12;
+                case 13:
+                    return Neo4jVersion.V_5_13;
                 default:
                     if (minorVersion >= MINOR_DEV_VERSION) {
                         return Neo4jVersion.V_Dev;

diff --git a/neo4j-adapter/src/test/java/org/neo4j/gds/compat/Neo4jVersionTest.java b/neo4j-adapter/src/test/java/org/neo4j/gds/compat/Neo4jVersionTest.java
@@ -47,7 +47,8 @@ class Neo4jVersionTest {
         "5.10.0, V_5_10",
         "5.11.0, V_5_11",
         "5.12.0, V_5_12",
-        "5.13.0, V_Dev",
+        "5.13.0, V_5_13",
+        "5.14.0, V_Dev",
     })
     void testParse(String input, Neo4jVersion expected) {
         assertEquals(expected.name(), Neo4jVersion.parse(input).name());

diff --git a/proc/sysinfo/src/test/java/org/neo4j/gds/SysInfoProcTest.java b/proc/sysinfo/src/test/java/org/neo4j/gds/SysInfoProcTest.java
@@ -78,6 +78,9 @@ class SysInfoProcTest extends BaseProcTest {
         "Neo4j 5.12",
         "Neo4j 5.12 (placeholder)",
 
+        "Neo4j 5.13",
+        "Neo4j 5.13 (placeholder)",
+
         "Neo4j DEV",
         "Neo4j DEV (placeholder)",
 
@@ -190,6 +193,14 @@ void testSysInfoProc() throws IOException {
                     "Neo4j 5.12"
                 );
                 break;
+            case V_5_13:
+                expectedCompatibilities = Set.of(
+                    "Neo4j Settings 5.x (placeholder)",
+                    "Neo4j Settings 5.x",
+                    "Neo4j 5.13 (placeholder)",
+                    "Neo4j 5.13"
+                );
+                break;
             case V_Dev:
                 expectedCompatibilities = Set.of(
                     "Neo4j Settings 5.x",