Merge pull request #8121 from knutwalker/2.4-rc-compat-3

Update RC compat
neo4j · Sep 12, 2023 · 32bc9fe · 32bc9fe
2 parents 59a2d2f + 756ae79
commit 32bc9fe
Show file tree

Hide file tree

Showing 28 changed files with 255 additions and 69 deletions.
diff --git a/...ility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/Neo4jProxyImpl.java b/...ility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/Neo4jProxyImpl.java
@@ -836,4 +836,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...ity/5.1/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_51/Neo4jProxyImpl.java b/...ity/5.1/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_51/Neo4jProxyImpl.java
@@ -953,4 +953,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, DependencyResolver.SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...y/5.10/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_510/Neo4jProxyImpl.java b/...y/5.10/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_510/Neo4jProxyImpl.java
@@ -948,4 +948,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...y/5.11/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_511/Neo4jProxyImpl.java b/...y/5.11/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_511/Neo4jProxyImpl.java
@@ -649,7 +649,11 @@ public String versionLongToString(long storeVersion) {
         Bits bits = Bits.bitsFromLongs(new long[]{storeVersion});
         int length = bits.getShort(8);
         if (length == 0 || length > 7) {
-            throw new IllegalArgumentException(format(Locale.ENGLISH, "The read version string length %d is not proper.", length));
+            throw new IllegalArgumentException(format(
+                Locale.ENGLISH,
+                "The read version string length %d is not proper.",
+                length
+            ));
         }
         char[] result = new char[length];
         for (int i = 0; i < length; i++) {
@@ -925,7 +929,10 @@ public boolean isCompositeDatabase(GraphDatabaseService databaseService) {
 
     @Override
     public <T> T lookupComponentProvider(Context ctx, Class<T> component, boolean safe) throws ProcedureException {
-        var globalProcedures = GraphDatabaseApiProxy.resolveDependency(ctx.dependencyResolver(), GlobalProcedures.class);
+        var globalProcedures = GraphDatabaseApiProxy.resolveDependency(
+            ctx.dependencyResolver(),
+            GlobalProcedures.class
+        );
         return globalProcedures.getCurrentView().lookupComponentProvider(component, safe).apply(ctx);
     }
 
@@ -948,4 +955,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...y/5.12/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_512/Neo4jProxyImpl.java b/...y/5.12/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_512/Neo4jProxyImpl.java
@@ -947,4 +947,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...ity/5.2/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_52/Neo4jProxyImpl.java b/...ity/5.2/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_52/Neo4jProxyImpl.java
@@ -951,4 +951,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, DependencyResolver.SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...ity/5.3/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_53/Neo4jProxyImpl.java b/...ity/5.3/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_53/Neo4jProxyImpl.java
@@ -952,4 +952,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, DependencyResolver.SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...ity/5.4/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_54/Neo4jProxyImpl.java b/...ity/5.4/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_54/Neo4jProxyImpl.java
@@ -951,4 +951,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, DependencyResolver.SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...ity/5.5/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_55/Neo4jProxyImpl.java b/...ity/5.5/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_55/Neo4jProxyImpl.java
@@ -952,4 +952,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, DependencyResolver.SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...ity/5.6/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_56/Neo4jProxyImpl.java b/...ity/5.6/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_56/Neo4jProxyImpl.java
@@ -952,4 +952,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...ity/5.7/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_57/Neo4jProxyImpl.java b/...ity/5.7/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_57/Neo4jProxyImpl.java
@@ -947,4 +947,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...ity/5.8/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_58/Neo4jProxyImpl.java b/...ity/5.8/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_58/Neo4jProxyImpl.java
@@ -947,4 +947,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/...ity/5.9/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_59/Neo4jProxyImpl.java b/...ity/5.9/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_59/Neo4jProxyImpl.java
@@ -947,4 +947,21 @@ public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
             }
         };
     }
+
+    private static final DependencyResolver EMPTY_DEPENDENCY_RESOLVER = new DependencyResolver.Adapter() {
+        @Override
+        public <T> T resolveDependency(Class<T> type, SelectionStrategy selector) {
+            return null;
+        }
+
+        @Override
+        public boolean containsDependency(Class<?> type) {
+            return false;
+        }
+    };
+
+    @Override
+    public DependencyResolver emptyDependencyResolver() {
+        return EMPTY_DEPENDENCY_RESOLVER;
+    }
 }
diff --git a/compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxyApi.java b/compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxyApi.java
@@ -21,6 +21,7 @@
 
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
+import org.neo4j.common.DependencyResolver;
 import org.neo4j.configuration.Config;
 import org.neo4j.configuration.connectors.ConnectorPortRegister;
 import org.neo4j.dbms.api.DatabaseManagementService;
@@ -327,4 +328,6 @@ TransactionalContext newQueryContext(
     <T> T lookupComponentProvider(Context ctx, Class<T> component, boolean safe) throws ProcedureException;
 
     GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures globalProcedures);
+
+    DependencyResolver emptyDependencyResolver();
 }
diff --git a/compatibility/common/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxy.java b/compatibility/common/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxy.java
@@ -21,6 +21,7 @@
 
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
+import org.neo4j.common.DependencyResolver;
 import org.neo4j.configuration.Config;
 import org.neo4j.configuration.connectors.ConnectorPortRegister;
 import org.neo4j.dbms.api.DatabaseManagementService;
@@ -493,6 +494,10 @@ public static GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures g
         return IMPL.globalProcedureRegistry(globalProcedures);
     }
 
+    public static DependencyResolver emptyDependencyResolver() {
+        return IMPL.emptyDependencyResolver();
+    }
+
     private Neo4jProxy() {
         throw new UnsupportedOperationException("No instances");
     }

diff --git a/executor/src/main/java/org/neo4j/gds/executor/ExecutionContext.java b/executor/src/main/java/org/neo4j/gds/executor/ExecutionContext.java
@@ -25,10 +25,10 @@
 import org.neo4j.gds.api.AlgorithmMetaDataSetter;
 import org.neo4j.gds.api.CloseableResourceRegistry;
 import org.neo4j.gds.api.DatabaseId;
-import org.neo4j.gds.api.EmptyDependencyResolver;
 import org.neo4j.gds.api.NodeLookup;
 import org.neo4j.gds.api.ProcedureReturnColumns;
 import org.neo4j.gds.api.TerminationMonitor;
+import org.neo4j.gds.compat.Neo4jProxy;
 import org.neo4j.gds.core.model.ModelCatalog;
 import org.neo4j.gds.core.utils.progress.EmptyTaskRegistryFactory;
 import org.neo4j.gds.core.utils.progress.TaskRegistryFactory;
@@ -120,7 +120,7 @@ public DatabaseId databaseId() {
 
         @Override
         public DependencyResolver dependencyResolver() {
-            return EmptyDependencyResolver.INSTANCE;
+            return Neo4jProxy.emptyDependencyResolver();
         }
 
         @Override

diff --git a/executor/src/test/java/org/neo4j/gds/executor/ProcedureExecutorTest.java b/executor/src/test/java/org/neo4j/gds/executor/ProcedureExecutorTest.java
@@ -25,7 +25,6 @@
 import org.neo4j.gds.ProcedureCallContextReturnColumns;
 import org.neo4j.gds.api.AlgorithmMetaDataSetter;
 import org.neo4j.gds.api.CloseableResourceRegistry;
-import org.neo4j.gds.api.EmptyDependencyResolver;
 import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.api.NodeLookup;
 import org.neo4j.gds.api.TerminationMonitor;
@@ -131,7 +130,7 @@ private ExecutionContext executionContext(TaskStore taskStore) {
             .username("")
             .terminationMonitor(TerminationMonitor.EMPTY)
             .isGdsAdmin(true)
-            .dependencyResolver(EmptyDependencyResolver.INSTANCE)
+            .dependencyResolver(Neo4jProxy.emptyDependencyResolver())
             .modelCatalog(ModelCatalog.EMPTY)
             .closeableResourceRegistry(CloseableResourceRegistry.EMPTY)
             .algorithmMetaDataSetter(AlgorithmMetaDataSetter.EMPTY)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -12,7 +12,6 @@ ext {
         '5.9': properties.getOrDefault('neo4jVersion59', '5.9.0'),
         '5.10': properties.getOrDefault('neo4jVersion510', '5.10.0'),
         '5.11': properties.getOrDefault('neo4jVersion511', '5.11.0'),
-        '5.12': properties.getOrDefault('neo4jVersion511', '5.12.0'),
         '5.12': properties.getOrDefault('neo4jVersion512', '5.12.0'),
     ]