Use resource monitor instead of statement

Co-authored-by: Mats Rydberg <[email protected]>
Co-authored-by: Paul Horn <[email protected]>

Author: 3 people

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

@@ -873,6 +873,13 @@ public String metricsManagerClass() {
         return "com.neo4j.metrics.global.MetricsManager";
     }
 
+    @Override
+    public void registerCloseableResource(KernelTransaction transaction, AutoCloseable autoCloseable) {
+        try (var statement = transaction.acquireStatement()) {
+            statement.registerCloseableResource(autoCloseable);
+        }
+    }
+
     @Override
     public <T> T nodeLabelTokenSet(
         NodeCursor nodeCursor,

compatibility/5-common/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_5x/CommonNeo4jProxyImpl.java

@@ -36,6 +36,7 @@
 import org.neo4j.gds.compat.PropertyReference;
 import org.neo4j.gds.compat.StoreScan;
 import org.neo4j.gds.compat.TestLog;
+import org.neo4j.kernel.api.KernelTransaction;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -514,4 +515,9 @@ public GlobalProcedureRegistry globalProcedureRegistry(org.neo4j.kernel.api.proc
     public String metricsManagerClass() {
         return "com.neo4j.metrics.global.MetricsManager";
     }
+
+    @Override
+    public void registerCloseableResource(KernelTransaction transaction, AutoCloseable autoCloseable) {
+        throw new IllegalStateException("Compat layer for 5.x must be run on Java 17");
+    }
 }

compatibility/5-common/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_5x/CommonNeo4jProxyImpl.java

@@ -749,4 +749,9 @@ public TransactionalContext newQueryContext(
     public String metricsManagerClass() {
         return "com.neo4j.metrics.global.MetricsManager";
     }
+
+    @Override
+    public void registerCloseableResource(KernelTransaction transaction, AutoCloseable autoCloseable) {
+        transaction.resourceMonitor().registerCloseableResource(autoCloseable);
+    }
 }

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

@@ -324,6 +324,11 @@ TransactionalContext newQueryContext(
 
     String metricsManagerClass();
 
+    void registerCloseableResource(
+        org.neo4j.kernel.api.KernelTransaction transaction,
+        AutoCloseable autoCloseable
+    );
+
     <T> T nodeLabelTokenSet(
         NodeCursor nodeCursor,
         Function<int[], T> intsConstructor,

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

@@ -486,6 +486,13 @@ public static String neo4jArrowServerAddressHeader() {
         return IMPL.neo4jArrowServerAddressHeader();
     }
 
+    public static void registerCloseableResource(
+        org.neo4j.kernel.api.KernelTransaction transaction,
+        AutoCloseable autoCloseable
+    ) {
+        IMPL.registerCloseableResource(transaction, autoCloseable);
+    }
+
     private Neo4jProxy() {
         throw new UnsupportedOperationException("No instances");
     }

procedures/integration/src/main/java/org/neo4j/gds/procedures/integration/CatalogFacadeProvider.java

@@ -45,6 +45,7 @@
 import org.neo4j.gds.applications.graphstorecatalog.WriteNodePropertiesApplication;
 import org.neo4j.gds.applications.graphstorecatalog.WriteRelationshipPropertiesApplication;
 import org.neo4j.gds.applications.graphstorecatalog.WriteRelationshipsApplication;
+import org.neo4j.gds.compat.Neo4jProxy;
 import org.neo4j.gds.core.loading.GraphStoreCatalogService;
 import org.neo4j.gds.core.write.ExporterContext;
 import org.neo4j.gds.logging.Log;
@@ -218,9 +219,7 @@ CatalogFacade createCatalogFacade(Context context) {
         var streamCloser = new Consumer<AutoCloseable>() {
             @Override
             public void accept(AutoCloseable autoCloseable) {
-                try (var statement = kernelTransaction.acquireStatement()) {
-                    statement.registerCloseableResource(autoCloseable);
-                }
+                Neo4jProxy.registerCloseableResource(kernelTransaction, autoCloseable);
             }
         };
         var terminationFlag = terminationFlagService.createTerminationFlag(kernelTransaction);