Merge pull request #9119 from soerenreichardt/fix-dev

Fix dev
neo4j · Jun 3, 2024 · 03a5559 · 03a5559
2 parents 621d2b1 + a5d228b
commit 03a5559
Show file tree

Hide file tree

Showing 9 changed files with 158 additions and 20 deletions.
diff --git a/...ity/5.15/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_515/Neo4jProxyImpl.java b/...ity/5.15/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_515/Neo4jProxyImpl.java
@@ -19,8 +19,14 @@
  */
 package org.neo4j.gds.compat._515;
 
+import org.neo4j.gds.compat.GlobalProcedureRegistry;
 import org.neo4j.gds.compat.Neo4jProxyApi;
 import org.neo4j.internal.kernel.api.Read;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
+import org.neo4j.kernel.api.procedure.GlobalProcedures;
+
+import java.util.stream.Stream;
 
 public final class Neo4jProxyImpl implements Neo4jProxyApi {
 
@@ -33,4 +39,24 @@ public long estimateNodeCount(Read read, int label) {
     public long estimateRelationshipCount(Read read, int sourceLabel, int targetLabel, int type) {
         return read.estimateCountsForRelationships(sourceLabel, type, targetLabel);
     }
+
+    @Override
+    public GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures globalProcedures) {
+        return new GlobalProcedureRegistry() {
+            @Override
+            public Stream<ProcedureSignature> getAllProcedures() {
+                return globalProcedures.getCurrentView().getAllProcedures().stream();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllNonAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllNonAggregatingFunctions();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllAggregatingFunctions();
+            }
+        };
+    }
 }
diff --git a/...ity/5.16/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_516/Neo4jProxyImpl.java b/...ity/5.16/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_516/Neo4jProxyImpl.java
@@ -19,8 +19,14 @@
  */
 package org.neo4j.gds.compat._516;
 
+import org.neo4j.gds.compat.GlobalProcedureRegistry;
 import org.neo4j.gds.compat.Neo4jProxyApi;
 import org.neo4j.internal.kernel.api.Read;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
+import org.neo4j.kernel.api.procedure.GlobalProcedures;
+
+import java.util.stream.Stream;
 
 public final class Neo4jProxyImpl implements Neo4jProxyApi {
 
@@ -33,4 +39,24 @@ public long estimateNodeCount(Read read, int label) {
     public long estimateRelationshipCount(Read read, int sourceLabel, int targetLabel, int type) {
         return read.estimateCountsForRelationships(sourceLabel, type, targetLabel);
     }
+
+    @Override
+    public GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures globalProcedures) {
+        return new GlobalProcedureRegistry() {
+            @Override
+            public Stream<ProcedureSignature> getAllProcedures() {
+                return globalProcedures.getCurrentView().getAllProcedures().stream();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllNonAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllNonAggregatingFunctions();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllAggregatingFunctions();
+            }
+        };
+    }
 }
diff --git a/...ity/5.17/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_517/Neo4jProxyImpl.java b/...ity/5.17/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_517/Neo4jProxyImpl.java
@@ -19,8 +19,14 @@
  */
 package org.neo4j.gds.compat._517;
 
+import org.neo4j.gds.compat.GlobalProcedureRegistry;
 import org.neo4j.gds.compat.Neo4jProxyApi;
 import org.neo4j.internal.kernel.api.Read;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
+import org.neo4j.kernel.api.procedure.GlobalProcedures;
+
+import java.util.stream.Stream;
 
 public final class Neo4jProxyImpl implements Neo4jProxyApi {
 
@@ -33,4 +39,24 @@ public long estimateNodeCount(Read read, int label) {
     public long estimateRelationshipCount(Read read, int sourceLabel, int targetLabel, int type) {
         return read.estimateCountsForRelationships(sourceLabel, type, targetLabel);
     }
+
+    @Override
+    public GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures globalProcedures) {
+        return new GlobalProcedureRegistry() {
+            @Override
+            public Stream<ProcedureSignature> getAllProcedures() {
+                return globalProcedures.getCurrentView().getAllProcedures().stream();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllNonAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllNonAggregatingFunctions();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllAggregatingFunctions();
+            }
+        };
+    }
 }
diff --git a/...ity/5.18/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_518/Neo4jProxyImpl.java b/...ity/5.18/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_518/Neo4jProxyImpl.java
@@ -21,17 +21,21 @@
 
 import org.neo4j.configuration.Config;
 import org.neo4j.gds.compat.CompatMonitor;
+import org.neo4j.gds.compat.GlobalProcedureRegistry;
 import org.neo4j.gds.compat.Neo4jProxyApi;
 import org.neo4j.internal.batchimport.AdditionalInitialIds;
 import org.neo4j.internal.batchimport.BatchImporter;
 import org.neo4j.internal.batchimport.Configuration;
 import org.neo4j.internal.batchimport.Monitor;
 import org.neo4j.internal.batchimport.input.Collector;
 import org.neo4j.internal.kernel.api.Read;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.layout.DatabaseLayout;
 import org.neo4j.io.pagecache.context.CursorContextFactory;
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
+import org.neo4j.kernel.api.procedure.GlobalProcedures;
 import org.neo4j.kernel.impl.index.schema.IndexImporterFactoryImpl;
 import org.neo4j.kernel.impl.transaction.log.files.TransactionLogInitializer;
 import org.neo4j.logging.internal.LogService;
@@ -41,6 +45,7 @@
 
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
+import java.util.stream.Stream;
 
 public final class Neo4jProxyImpl implements Neo4jProxyApi {
 
@@ -109,4 +114,24 @@ public void completed(boolean success) {
             }
         };
     }
+
+    @Override
+    public GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures globalProcedures) {
+        return new GlobalProcedureRegistry() {
+            @Override
+            public Stream<ProcedureSignature> getAllProcedures() {
+                return globalProcedures.getCurrentView().getAllProcedures().stream();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllNonAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllNonAggregatingFunctions();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllAggregatingFunctions();
+            }
+        };
+    }
 }
diff --git a/...ity/5.19/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_519/Neo4jProxyImpl.java b/...ity/5.19/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_519/Neo4jProxyImpl.java
@@ -21,17 +21,21 @@
 
 import org.neo4j.configuration.Config;
 import org.neo4j.gds.compat.CompatMonitor;
+import org.neo4j.gds.compat.GlobalProcedureRegistry;
 import org.neo4j.gds.compat.Neo4jProxyApi;
 import org.neo4j.internal.batchimport.AdditionalInitialIds;
 import org.neo4j.internal.batchimport.BatchImporter;
 import org.neo4j.internal.batchimport.Configuration;
 import org.neo4j.internal.batchimport.Monitor;
 import org.neo4j.internal.batchimport.input.Collector;
 import org.neo4j.internal.kernel.api.Read;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.layout.DatabaseLayout;
 import org.neo4j.io.pagecache.context.CursorContextFactory;
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
+import org.neo4j.kernel.api.procedure.GlobalProcedures;
 import org.neo4j.kernel.impl.index.schema.IndexImporterFactoryImpl;
 import org.neo4j.kernel.impl.transaction.log.files.TransactionLogInitializer;
 import org.neo4j.logging.internal.LogService;
@@ -41,6 +45,7 @@
 
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
+import java.util.stream.Stream;
 
 public final class Neo4jProxyImpl implements Neo4jProxyApi {
 
@@ -109,4 +114,24 @@ public void completed(boolean success) {
             }
         };
     }
+
+    @Override
+    public GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures globalProcedures) {
+        return new GlobalProcedureRegistry() {
+            @Override
+            public Stream<ProcedureSignature> getAllProcedures() {
+                return globalProcedures.getCurrentView().getAllProcedures().stream();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllNonAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllNonAggregatingFunctions();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllAggregatingFunctions();
+            }
+        };
+    }
 }
diff --git a/...ity/5.20/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_520/Neo4jProxyImpl.java b/...ity/5.20/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_520/Neo4jProxyImpl.java
@@ -21,18 +21,22 @@
 
 import org.neo4j.configuration.Config;
 import org.neo4j.gds.compat.CompatMonitor;
+import org.neo4j.gds.compat.GlobalProcedureRegistry;
 import org.neo4j.gds.compat.Neo4jProxyApi;
 import org.neo4j.internal.batchimport.AdditionalInitialIds;
 import org.neo4j.internal.batchimport.BatchImporter;
 import org.neo4j.internal.batchimport.Configuration;
 import org.neo4j.internal.batchimport.Monitor;
 import org.neo4j.internal.batchimport.input.Collector;
 import org.neo4j.internal.kernel.api.Read;
+import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
+import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.layout.DatabaseLayout;
 import org.neo4j.io.pagecache.context.CursorContextFactory;
 import org.neo4j.io.pagecache.context.FixedVersionContextSupplier;
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
+import org.neo4j.kernel.api.procedure.GlobalProcedures;
 import org.neo4j.kernel.impl.index.schema.IndexImporterFactoryImpl;
 import org.neo4j.kernel.impl.transaction.log.files.TransactionLogInitializer;
 import org.neo4j.logging.internal.LogService;
@@ -43,6 +47,7 @@
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 public final class Neo4jProxyImpl implements Neo4jProxyApi {
 
@@ -118,4 +123,24 @@ public void completed(boolean success) {
             }
         };
     }
+
+    @Override
+    public GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures globalProcedures) {
+        return new GlobalProcedureRegistry() {
+            @Override
+            public Stream<ProcedureSignature> getAllProcedures() {
+                return globalProcedures.getCurrentView().getAllProcedures().stream();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllNonAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllNonAggregatingFunctions();
+            }
+
+            @Override
+            public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
+                return globalProcedures.getCurrentView().getAllAggregatingFunctions();
+            }
+        };
+    }
 }
diff --git a/.../api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/GlobalProcedureRegistry.java b/.../api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/GlobalProcedureRegistry.java
@@ -22,11 +22,10 @@
 import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
 import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
 
-import java.util.Set;
 import java.util.stream.Stream;
 
 public interface GlobalProcedureRegistry {
-    Set<ProcedureSignature> getAllProcedures();
+    Stream<ProcedureSignature> getAllProcedures();
     Stream<UserFunctionSignature> getAllNonAggregatingFunctions();
     Stream<UserFunctionSignature> getAllAggregatingFunctions();
 }
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
@@ -28,6 +28,7 @@
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.layout.DatabaseLayout;
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
+import org.neo4j.kernel.api.procedure.GlobalProcedures;
 import org.neo4j.logging.internal.LogService;
 import org.neo4j.scheduler.JobScheduler;
 
@@ -54,4 +55,6 @@ default BatchImporter instantiateBlockBatchImporter(
     ) {
         throw new UnsupportedOperationException("GDS does not support block store format batch importer on this Neo4j version. Requires >= Neo4j 5.18.");
     }
+
+    GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures globalProcedures);
 }
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
@@ -106,8 +106,6 @@
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Stream;
 
 import static java.lang.String.format;
 import static org.neo4j.gds.compat.InternalReadOps.countByIdGenerator;
@@ -226,22 +224,7 @@ public static <T> T lookupComponentProvider(Context ctx, Class<T> component, boo
     }
 
     public static GlobalProcedureRegistry globalProcedureRegistry(GlobalProcedures globalProcedures) {
-        return new GlobalProcedureRegistry() {
-            @Override
-            public Set<ProcedureSignature> getAllProcedures() {
-                return globalProcedures.getCurrentView().getAllProcedures();
-            }
-
-            @Override
-            public Stream<UserFunctionSignature> getAllNonAggregatingFunctions() {
-                return globalProcedures.getCurrentView().getAllNonAggregatingFunctions();
-            }
-
-            @Override
-            public Stream<UserFunctionSignature> getAllAggregatingFunctions() {
-                return globalProcedures.getCurrentView().getAllAggregatingFunctions();
-            }
-        };
+        return IMPL.globalProcedureRegistry(globalProcedures);
     }
 
     public static String validateExternalDatabaseName(String databaseName) {