Revert "Use GraphDatabaseService throughout GdsPBI"

Author: s1ck

compatibility/4.3/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_43/Neo4jProxyImpl.java

@@ -43,7 +43,6 @@
 import org.neo4j.gds.compat.PropertyReference;
 import org.neo4j.gds.compat.StoreScan;
 import org.neo4j.gds.compat.TestLog;
-import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
@@ -563,7 +562,7 @@ public RecordFormats recordFormatSelector(
         Config databaseConfig,
         FileSystemAbstraction fs,
         LogService logService,
-        GraphDatabaseService databaseService
+        DependencyResolver dependencyResolver
     ) {
         return RecordFormatSelector.selectForConfig(databaseConfig, logService.getInternalLogProvider());
     }

compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/Neo4jProxyImpl.java

@@ -41,7 +41,6 @@
 import org.neo4j.gds.compat.PropertyReference;
 import org.neo4j.gds.compat.StoreScan;
 import org.neo4j.gds.compat.TestLog;
-import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
@@ -566,7 +565,7 @@ public RecordFormats recordFormatSelector(
         Config databaseConfig,
         FileSystemAbstraction fs,
         LogService logService,
-        GraphDatabaseService databaseService
+        DependencyResolver dependencyResolver
     ) {
         return RecordFormatSelector.selectForConfig(databaseConfig, logService.getInternalLogProvider());
     }

compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxyApi.java

@@ -20,11 +20,11 @@
 package org.neo4j.gds.compat;
 
 import org.jetbrains.annotations.Nullable;
+import org.neo4j.common.DependencyResolver;
 import org.neo4j.configuration.Config;
 import org.neo4j.configuration.connectors.ConnectorPortRegister;
 import org.neo4j.dbms.api.DatabaseManagementService;
 import org.neo4j.exceptions.KernelException;
-import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
@@ -257,7 +257,7 @@ RecordFormats recordFormatSelector(
         Config databaseConfig,
         FileSystemAbstraction fs,
         LogService logService,
-        GraphDatabaseService databaseService
+        DependencyResolver dependencyResolver
     );
 
     NamedDatabaseId randomDatabaseId();

compatibility/common/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxy.java

@@ -21,11 +21,11 @@
 
 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;
 import org.neo4j.exceptions.KernelException;
-import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
@@ -387,9 +387,9 @@ public static RecordFormats recordFormatSelector(
         Config databaseConfig,
         FileSystemAbstraction fs,
         LogService logService,
-        GraphDatabaseService databaseService
+        DependencyResolver dependencyResolver
     ) {
-        return IMPL.recordFormatSelector(databaseName, databaseConfig, fs, logService, databaseService);
+        return IMPL.recordFormatSelector(databaseName, databaseConfig, fs, logService, dependencyResolver);
     }
 
     public static NamedDatabaseId randomDatabaseId() {

io/core/src/main/java/org/neo4j/gds/core/io/db/GdsParallelBatchImporter.java

@@ -19,15 +19,14 @@
  */
 package org.neo4j.gds.core.io.db;
 
+import org.neo4j.common.DependencyResolver;
 import org.neo4j.configuration.Config;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.dbms.api.DatabaseManagementService;
 import org.neo4j.gds.compat.CompatInput;
-import org.neo4j.gds.compat.GraphDatabaseApiProxy;
 import org.neo4j.gds.compat.Neo4jProxy;
 import org.neo4j.gds.core.Settings;
 import org.neo4j.gds.core.utils.ProgressTimer;
-import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.internal.batchimport.AdditionalInitialIds;
 import org.neo4j.internal.batchimport.BatchImporter;
 import org.neo4j.internal.batchimport.BatchImporterFactory;
@@ -38,6 +37,7 @@
 import org.neo4j.io.layout.DatabaseLayout;
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
 import org.neo4j.kernel.impl.scheduler.JobSchedulerFactory;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.logging.Log;
 import org.neo4j.logging.internal.LogService;
@@ -59,28 +59,29 @@ public final class GdsParallelBatchImporter {
     private final Log log;
     private final ExecutionMonitor executionMonitor;
 
+    private final DependencyResolver dependencyResolver;
     private final FileSystemAbstraction fs;
     private final LogService logService;
     private final Config databaseConfig;
     private final DatabaseManagementService dbms;
-    private final GraphDatabaseService databaseService;
 
     static GdsParallelBatchImporter fromDb(
-        GraphDatabaseService databaseService,
+        GraphDatabaseAPI db,
         GraphStoreToDatabaseExporterConfig config,
         Log log,
         ExecutionMonitor executionMonitor
     ) {
-        var dbms = GraphDatabaseApiProxy.resolveDependency(databaseService, DatabaseManagementService.class);
-        var fs = GraphDatabaseApiProxy.resolveDependency(databaseService, FileSystemAbstraction.class);
-        var logService = GraphDatabaseApiProxy.resolveDependency(databaseService, LogService.class);
-        var databaseConfig = GraphDatabaseApiProxy.resolveDependency(databaseService, Config.class);
+        var dependencyResolver = db.getDependencyResolver();
+        var dbms = dependencyResolver.resolveDependency(DatabaseManagementService.class);
+        var fs = dependencyResolver.resolveDependency(FileSystemAbstraction.class);
+        var logService = dependencyResolver.resolveDependency(LogService.class);
+        var databaseConfig = dependencyResolver.resolveDependency(Config.class);
         return new GdsParallelBatchImporter(
             config,
             log,
             executionMonitor,
             dbms,
-            databaseService,
+            dependencyResolver,
             fs,
             logService,
             databaseConfig
@@ -93,16 +94,17 @@ public static GdsParallelBatchImporter fromDbms(
         Log log,
         ExecutionMonitor executionMonitor
     ) {
-        var databaseService = dbms.database(SYSTEM_DATABASE_NAME);
-        var fs = GraphDatabaseApiProxy.resolveDependency(databaseService, FileSystemAbstraction.class);
-        var logService = GraphDatabaseApiProxy.resolveDependency(databaseService, LogService.class);
-        var databaseConfig = GraphDatabaseApiProxy.resolveDependency(databaseService, Config.class);
+        var db = (GraphDatabaseAPI) dbms.database(SYSTEM_DATABASE_NAME);
+        var dependencyResolver = db.getDependencyResolver();
+        var fs = dependencyResolver.resolveDependency(FileSystemAbstraction.class);
+        var logService = dependencyResolver.resolveDependency(LogService.class);
+        var databaseConfig = dependencyResolver.resolveDependency(Config.class);
         return new GdsParallelBatchImporter(
             config,
             log,
             executionMonitor,
             dbms,
-            databaseService,
+            dependencyResolver,
             fs,
             logService,
             databaseConfig
@@ -114,7 +116,7 @@ private GdsParallelBatchImporter(
         Log log,
         ExecutionMonitor executionMonitor,
         DatabaseManagementService dbms,
-        GraphDatabaseService databaseService,
+        DependencyResolver dependencyResolver,
         FileSystemAbstraction fs,
         LogService logService,
         Config databaseConfig
@@ -123,7 +125,7 @@ private GdsParallelBatchImporter(
         this.log = log;
         this.executionMonitor = executionMonitor;
         this.dbms = dbms;
-        this.databaseService = databaseService;
+        this.dependencyResolver = dependencyResolver;
         this.fs = fs;
         this.logService = logService;
 
@@ -164,13 +166,7 @@ public void writeDatabase(CompatInput compatInput, boolean startDatabase) {
             lifeSupport.start();
 
             var input = Neo4jProxy.batchInputFrom(compatInput);
-            var batchImporter = instantiateBatchImporter(
-                databaseLayout,
-                logService,
-                collector,
-                jobScheduler,
-                databaseService
-            );
+            var batchImporter = instantiateBatchImporter(databaseLayout, logService, collector, jobScheduler);
             batchImporter.doImport(input);
             log.info(formatWithLocale("Database import finished after %s ms", importTimer.stop().getDuration()));
 
@@ -224,8 +220,7 @@ private BatchImporter instantiateBatchImporter(
         DatabaseLayout databaseLayout,
         LogService logService,
         Collector collector,
-        JobScheduler jobScheduler,
-        GraphDatabaseService databaseService
+        JobScheduler jobScheduler
     ) {
         return Neo4jProxy.instantiateBatchImporter(
             BatchImporterFactory.withHighestPriority(),
@@ -242,7 +237,7 @@ private BatchImporter instantiateBatchImporter(
                 databaseConfig,
                 fs,
                 logService,
-                databaseService
+                dependencyResolver
             ),
             jobScheduler,
             collector

io/core/src/main/java/org/neo4j/gds/core/io/db/GraphStoreToDatabaseExporter.java

@@ -25,7 +25,7 @@
 import org.neo4j.gds.core.io.NeoNodeProperties;
 import org.neo4j.gds.core.utils.ClockService;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
-import org.neo4j.graphdb.GraphDatabaseService;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.logging.Log;
 
 import java.util.Optional;
@@ -37,28 +37,28 @@ public final class GraphStoreToDatabaseExporter extends GraphStoreExporter<Graph
 
     public static GraphStoreToDatabaseExporter of(
         GraphStore graphStore,
-        GraphDatabaseService databaseService,
+        GraphDatabaseAPI api,
         GraphStoreToDatabaseExporterConfig config,
         Log log,
         ProgressTracker progressTracker
     ) {
-        return of(graphStore, databaseService, config, Optional.empty(), log, progressTracker);
+        return of(graphStore, api, config, Optional.empty(), log, progressTracker);
     }
 
     public static GraphStoreToDatabaseExporter of(
         GraphStore graphStore,
-        GraphDatabaseService databaseService,
+        GraphDatabaseAPI api,
         GraphStoreToDatabaseExporterConfig config,
         Optional<NeoNodeProperties> neoNodeProperties,
         Log log,
         ProgressTracker progressTracker
     ) {
-        return new GraphStoreToDatabaseExporter(graphStore, databaseService, config, neoNodeProperties, log, progressTracker);
+        return new GraphStoreToDatabaseExporter(graphStore, api, config, neoNodeProperties, log, progressTracker);
     }
 
     private GraphStoreToDatabaseExporter(
         GraphStore graphStore,
-        GraphDatabaseService graphDatabaseService,
+        GraphDatabaseAPI api,
         GraphStoreToDatabaseExporterConfig config,
         Optional<NeoNodeProperties> neoNodeProperties,
         Log log,
@@ -71,7 +71,7 @@ private GraphStoreToDatabaseExporter(
             config.executionMonitorCheckMillis(),
             TimeUnit.MILLISECONDS
         );
-        this.parallelBatchImporter = GdsParallelBatchImporter.fromDb(graphDatabaseService, config, log, executionMonitor);
+        this.parallelBatchImporter = GdsParallelBatchImporter.fromDb(api, config, log, executionMonitor);
     }
 
     @Override