Merge pull request #9886 from neo-technology/legacy-cypher-taskstore

Clean up task store more often for Legacy Cypher Projection

Author: Mats-SX

legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherFactory.java

@@ -162,8 +162,8 @@ public GraphDimensions estimationDimensions() {
     @Override
     public CSRGraphStore build() {
         // Temporarily override the security context to enforce read-only access during load
-        return readOnlyTransaction().apply((tx, ktx) -> {
-            try {
+        try {
+            return readOnlyTransaction().apply((tx, ktx) -> {
                 progressTracker.beginSubTask("Loading");
                 BatchLoadResult nodeCount = new CountingCypherRecordLoader(
                     cypherConfig.nodeQuery(),
@@ -198,11 +198,11 @@ public CSRGraphStore build() {
                 logLoadingSummary(graphStore);
 
                 return graphStore;
-            } catch (RuntimeException ex) {
-                progressTracker.endSubTaskWithFailure();
-                throw ex;
-            }
-        });
+            });
+        } catch (Throwable ex) {
+            progressTracker.endSubTaskWithFailure();
+            throw ex;
+        }
     }
 
     private ProgressTracker initProgressTracker() {

legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherQueryEstimator.java

@@ -27,7 +27,6 @@
 import java.util.Collection;
 
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
-import static org.neo4j.internal.kernel.api.security.AccessMode.Static.READ;
 
 public class CypherQueryEstimator {
 
@@ -48,7 +47,7 @@ public EstimationResult getRelationshipEstimation(String relationshipQuery) {
     }
 
     private EstimationResult runEstimationQuery(String query, Collection<String> reservedColumns) {
-        return context.withRestrictedAccess(READ).apply((tx, ktx) -> {
+        return context.apply((tx, ktx) -> {
             var explainQuery = formatWithLocale("EXPLAIN %s", query);
             try (var result = tx.execute(explainQuery)) {
                 var estimatedRows = (Number) result.getExecutionPlanDescription().getArguments().get("EstimatedRows");