cleanup

neo4j · Aug 16, 2024 · ff1fc09 · ff1fc09
1 parent db066b9
commit ff1fc09
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 103 deletions.
diff --git a/executor/src/main/java/org/neo4j/gds/executor/ExecutionContext.java b/executor/src/main/java/org/neo4j/gds/executor/ExecutionContext.java
@@ -35,7 +35,6 @@
 import org.neo4j.gds.core.utils.warnings.UserLogRegistryFactory;
 import org.neo4j.gds.core.write.NodePropertyExporterBuilder;
 import org.neo4j.gds.core.write.RelationshipExporterBuilder;
-import org.neo4j.gds.core.write.RelationshipStreamExporterBuilder;
 import org.neo4j.gds.logging.Log;
 import org.neo4j.gds.metrics.MetricsFacade;
 import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade;
@@ -76,9 +75,6 @@ public interface ExecutionContext {
     @Nullable
     AlgorithmsProcedureFacade algorithmsProcedureFacade();
 
-    @Nullable
-    RelationshipStreamExporterBuilder relationshipStreamExporterBuilder();
-
     @Nullable
     RelationshipExporterBuilder relationshipExporterBuilder();
 
@@ -93,14 +89,6 @@ default ExecutionContext withNodePropertyExporterBuilder(NodePropertyExporterBui
             .build();
     }
 
-    default ExecutionContext withRelationshipStreamExporterBuilder(RelationshipStreamExporterBuilder relationshipStreamExporterBuilder) {
-        return ImmutableExecutionContext
-            .builder()
-            .from(this)
-            .relationshipStreamExporterBuilder(relationshipStreamExporterBuilder)
-            .build();
-    }
-
     default ExecutionContext withRelationshipExporterBuilder(RelationshipExporterBuilder relationshipExporterBuilder) {
         return ImmutableExecutionContext
             .builder()
@@ -182,19 +170,13 @@ public boolean isGdsAdmin() {
         @Override
         public MetricsFacade metricsFacade() {
             return MetricsFacade.PASSTHROUGH_METRICS_FACADE;
-
         }
 
         @Override
         public AlgorithmsProcedureFacade algorithmsProcedureFacade() {
             return null;
         }
 
-        @Override
-        public @Nullable RelationshipStreamExporterBuilder relationshipStreamExporterBuilder() {
-            return null;
-        }
-
         @Override
         public @Nullable RelationshipExporterBuilder relationshipExporterBuilder() {
             return null;

diff --git a/proc/common/src/main/java/org/neo4j/gds/BaseProc.java b/proc/common/src/main/java/org/neo4j/gds/BaseProc.java
@@ -20,22 +20,18 @@
 package org.neo4j.gds;
 
 import org.neo4j.gds.api.DatabaseId;
-import org.neo4j.gds.applications.graphstorecatalog.GraphStoreFromCatalogLoader;
 import org.neo4j.gds.compat.GraphDatabaseApiProxy;
-import org.neo4j.gds.config.BaseConfig;
-import org.neo4j.gds.core.CypherMapAccess;
 import org.neo4j.gds.core.Username;
-import org.neo4j.gds.core.loading.GraphStoreCatalogEntry;
 import org.neo4j.gds.core.utils.progress.TaskRegistryFactory;
 import org.neo4j.gds.core.utils.warnings.UserLogRegistryFactory;
 import org.neo4j.gds.executor.ExecutionContext;
 import org.neo4j.gds.executor.ImmutableExecutionContext;
+import org.neo4j.gds.logging.LogAdapter;
 import org.neo4j.gds.metrics.MetricsFacade;
 import org.neo4j.gds.procedures.GraphDataScienceProcedures;
 import org.neo4j.gds.procedures.ProcedureCallContextReturnColumns;
 import org.neo4j.gds.procedures.TransactionCloseableResourceRegistry;
 import org.neo4j.gds.procedures.TransactionNodeLookup;
-import org.neo4j.gds.logging.LogAdapter;
 import org.neo4j.gds.procedures.integration.TransactionTerminationMonitor;
 import org.neo4j.gds.transaction.DatabaseTransactionContext;
 import org.neo4j.gds.transaction.EmptyTransactionContext;
@@ -48,8 +44,6 @@
 import org.neo4j.logging.Log;
 import org.neo4j.procedure.Context;
 
-import java.util.function.Supplier;
-
 public abstract class BaseProc {
 
     public static final String ESTIMATE_DESCRIPTION = "Returns an estimation of the memory consumption for that procedure.";
@@ -88,16 +82,6 @@ protected String username() {
         return username.username();
     }
 
-    protected GraphStoreCatalogEntry graphStoreFromCatalog(String graphName, BaseConfig config) {
-        return GraphStoreFromCatalogLoader.graphStoreFromCatalog(
-            graphName,
-            config,
-            username(),
-            databaseId(),
-            isGdsAdmin()
-        );
-    }
-
     protected boolean isGdsAdmin() {
         if (transaction == null) {
             // No transaction available (likely we're in a test), no-one is admin here
@@ -109,19 +93,6 @@ protected boolean isGdsAdmin() {
         return transaction.securityContext().roles().contains(PREDEFINED_ADMIN_ROLE);
     }
 
-    protected final <R> R runWithExceptionLogging(String message, Supplier<R> supplier) {
-        try {
-            return supplier.get();
-        } catch (Exception e) {
-            log.warn(message, e);
-            throw e;
-        }
-    }
-
-    protected final void validateConfig(CypherMapAccess cypherConfig, BaseConfig config) {
-        cypherConfig.requireOnlyKeysFrom(config.configKeys());
-    }
-
     public ExecutionContext executionContext() {
         return databaseService == null
             ? ExecutionContext.EMPTY

diff --git a/proc/test/src/test/java/org/neo4j/gds/BaseProcUnitTest.java b/proc/test/src/test/java/org/neo4j/gds/BaseProcUnitTest.java