Remove 5.0.0-drop06.0 compat layer

s1ck · s1ck · commit fcabcd053b79 · 2022-09-12T13:36:06.000+02:00
diff --git a/compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/SettingProxyFactoryImpl.java b/compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/SettingProxyFactoryImpl.java
@@ -29,7 +29,7 @@ public class SettingProxyFactoryImpl implements SettingProxyFactory {
 
     @Override
     public boolean canLoad(Neo4jVersion version) {
-        return version != Neo4jVersion.V_5_0_drop60 && version != Neo4jVersion.V_5_0_drop80;
+        return version != Neo4jVersion.V_5_0_drop80 && version != Neo4jVersion.V_5_0_drop90;
     }
 
     @Override
diff --git a/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryNodeCursorTest.java b/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryNodeCursorTest.java
@@ -64,7 +64,6 @@ protected GraphStore graphStore() {
 
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
     void shouldScanSingle() {
@@ -75,7 +74,6 @@ void shouldScanSingle() {
 
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
     void shouldScanRange() {
@@ -89,7 +87,6 @@ void shouldScanRange() {
 
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
     void shouldScanAll() {
@@ -104,7 +101,6 @@ void shouldScanAll() {
 
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
     void testLabels() {
@@ -130,7 +126,6 @@ void shouldHaveProperties43() {
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_3)
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
     void shouldHaveProperties() {
@@ -141,7 +136,6 @@ void shouldHaveProperties() {
 
     @Test
     @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-    @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
     @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
     void shouldTraverseProperties() throws TokenNotFoundException {
diff --git a/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipScanCursorTest.java b/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipScanCursorTest.java
@@ -41,7 +41,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
 public class InMemoryRelationshipScanCursorTest extends CypherTest {
diff --git a/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipTraversalCursorTest.java b/cypher/cypher-test/src/test/java/org/neo4j/gds/storageengine/InMemoryRelationshipTraversalCursorTest.java
@@ -44,7 +44,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
 class InMemoryRelationshipTraversalCursorTest extends CypherTest {
diff --git a/cypher/cypher-test/src/test/java/org/neo4j/internal/recordstorage/InMemoryStorageEngineTest.java b/cypher/cypher-test/src/test/java/org/neo4j/internal/recordstorage/InMemoryStorageEngineTest.java
@@ -36,7 +36,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DisableForNeo4jVersion(Neo4jVersion.V_4_4_9_drop10)
-@DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop60)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop80)
 @DisableForNeo4jVersion(Neo4jVersion.V_5_0_drop90)
 class InMemoryStorageEngineTest extends CypherTest {
diff --git a/cypher/unsupported/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/unsupported/StorageEngineProxyFactoryImpl.java b/cypher/unsupported/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/unsupported/StorageEngineProxyFactoryImpl.java
@@ -32,7 +32,6 @@ public class StorageEngineProxyFactoryImpl implements StorageEngineProxyFactory
 
     private static final Collection<Neo4jVersion> incompatibleVersions = EnumSet.of(
         Neo4jVersion.V_4_4_9_drop10,
-        Neo4jVersion.V_5_0_drop60,
         Neo4jVersion.V_5_0_drop80,
         Neo4jVersion.V_5_0_drop90
     );
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
@@ -30,7 +30,6 @@ public enum Neo4jVersion {
     V_4_4,
     V_4_4_9_drop10,
     V_4_4_10_drop10,
-    V_5_0_drop60,
     V_5_0_drop80,
     V_5_0_drop90;
 
@@ -45,8 +44,6 @@ public String toString() {
                 return "4.4.9-drop01.0";
             case V_4_4_10_drop10:
                 return "4.4.10-drop01.0";
-            case V_5_0_drop60:
-                return "5.0.0-drop06.0";
             case V_5_0_drop80:
                 return "5.0.0-drop08.0";
             case V_5_0_drop90:
@@ -93,10 +90,6 @@ static Neo4jVersion parse(String version) {
             return Neo4jVersion.V_4_4_10_drop10;
         }
 
-        if ("5.0.0-drop06.0".equals(version)) {
-            return Neo4jVersion.V_5_0_drop60;
-        }
-
         if ("5.0.0-drop08.0".equals(version)) {
             return Neo4jVersion.V_5_0_drop80;
         }
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
@@ -39,7 +39,6 @@ class Neo4jVersionTest {
         "4.4.12, V_4_4",
         "4.4.9-drop01.0, V_4_4_9_drop10",
         "4.4.10-drop01.0, V_4_4_10_drop10",
-        "5.0.0-drop06.0, V_5_0_drop60",
         "5.0.0-drop08.0, V_5_0_drop80",
         "5.0.0-drop09.0, V_5_0_drop90",
     })
diff --git a/proc/sysinfo/src/test/java/org/neo4j/gds/SysInfoProcTest.java b/proc/sysinfo/src/test/java/org/neo4j/gds/SysInfoProcTest.java
@@ -49,22 +49,18 @@ class SysInfoProcTest extends BaseProcTest {
 
     private static final Collection<String> ALL_COMPATIBILITIES = List.of(
         "Neo4j Settings 4.x",
-        "Neo4j Settings 5.0.0-drop06.0 (placeholder)",
         "Neo4j Settings 5.0.0-drop08.0 (placeholder)",
         "Neo4j Settings 5.0.0-drop09.0 (placeholder)",
-        "Neo4j Settings 5.0.0-drop06.0",
         "Neo4j Settings 5.0.0-drop08.0",
         "Neo4j Settings 5.0.0-drop09.0",
         "Neo4j 4.3",
         "Neo4j 4.4",
         "Neo4j 4.4.9-drop01.0",
         "Neo4j 4.4.10-drop01.0",
-        "Neo4j 5.0.0-drop06.0 (placeholder)",
         "Neo4j 5.0.0-drop08.0 (placeholder)",
         "Neo4j 5.0.0-drop09.0 (placeholder)",
-        "Neo4j 5.0.0-drop06.0",
         "Neo4j 5.0.0-drop08.0",
-        "Neo4j 5.0.0-drop09.0",
+        "Neo4j 5.0.0-drop09.0"
     );
 
     @BeforeEach
@@ -125,14 +121,6 @@ void testSysInfoProc() throws IOException {
             case V_4_4_10_drop10:
                 expectedCompatibilities = Set.of("Neo4j 4.4.10-drop01.0", "Neo4j Settings 4.x");
                 break;
-            case V_5_0_drop60:
-                expectedCompatibilities = Set.of(
-                    "Neo4j Settings 5.0.0-drop06.0 (placeholder)",
-                    "Neo4j Settings 5.0.0-drop06.0",
-                    "Neo4j 5.0.0-drop06.0 (placeholder)",
-                    "Neo4j 5.0.0-drop06.0"
-                );
-                break;
             case V_5_0_drop80:
                 expectedCompatibilities = Set.of(
                     "Neo4j Settings 5.0.0-drop08.0 (placeholder)",

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class SettingProxyFactoryImpl implements SettingProxyFactory {`
`29`	`29`
`30`	`30`	`@Override`
`31`	`31`	`public boolean canLoad(Neo4jVersion version) {`
`32`		`- return version != Neo4jVersion.V_5_0_drop60 && version != Neo4jVersion.V_5_0_drop80;`
	`32`	`+ return version != Neo4jVersion.V_5_0_drop80 && version != Neo4jVersion.V_5_0_drop90;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`