diff --git a/compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompatExecutionMonitor.java b/compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompatExecutionMonitor.java deleted file mode 100644 index 7925c9f263..0000000000 --- a/compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompatExecutionMonitor.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) "Neo4j" - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.neo4j.gds.compat; - -import org.neo4j.common.DependencyResolver; -import org.neo4j.internal.batchimport.staging.StageExecution; - -import java.time.Clock; - -/** - * Gets notified now and then about {@link org.neo4j.internal.batchimport.staging.StageExecution}, where statistics can be read and displayed, - * aggregated or in other ways make sense of the data of {@link org.neo4j.internal.batchimport.staging.StageExecution}. - */ -public interface CompatExecutionMonitor { - /** - * Signals start of import. Called only once and before any other method. - * - * @param dependencyResolver {@link org.neo4j.common.DependencyResolver} for getting dependencies from. - */ - void initialize(DependencyResolver dependencyResolver); - - /** - * Signals the start of a {@link org.neo4j.internal.batchimport.staging.StageExecution}. - */ - void start(StageExecution execution); - - /** - * Signals the end of the execution previously {@link #start(StageExecution) started}. - */ - void end(StageExecution execution, long totalTimeMillis); - - /** - * Called after all {@link StageExecution stage executions} have run. - */ - void done(boolean successful, long totalTimeMillis, String additionalInformation); - - /** - * Called periodically while executing a {@link StageExecution}. - */ - void check(StageExecution execution); - - /** - * Clock to use for interval checks - */ - Clock clock(); - - /** - * @return rough time interval this monitor needs checking. - */ - long checkIntervalMillis(); -} 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 index cb1ec954a4..25e1b632c7 100644 --- 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 @@ -45,7 +45,6 @@ import org.neo4j.internal.batchimport.input.InputEntityVisitor; import org.neo4j.internal.batchimport.input.ReadableGroups; import org.neo4j.internal.batchimport.staging.ExecutionMonitor; -import org.neo4j.internal.batchimport.staging.StageExecution; import org.neo4j.internal.helpers.HostnamePort; import org.neo4j.internal.id.IdGenerator; import org.neo4j.internal.id.IdGeneratorFactory; @@ -113,7 +112,6 @@ import java.util.Locale; import java.util.Optional; import java.util.Set; -import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Stream; @@ -652,39 +650,6 @@ public static RecordFormats recordFormatSelector( ); } - public static ExecutionMonitor executionMonitor(CompatExecutionMonitor compatExecutionMonitor) { - return new ExecutionMonitor.Adapter( - compatExecutionMonitor.checkIntervalMillis(), - TimeUnit.MILLISECONDS - ) { - - @Override - public void initialize(DependencyResolver dependencyResolver) { - compatExecutionMonitor.initialize(dependencyResolver); - } - - @Override - public void start(StageExecution execution) { - compatExecutionMonitor.start(execution); - } - - @Override - public void end(StageExecution execution, long totalTimeMillis) { - compatExecutionMonitor.end(execution, totalTimeMillis); - } - - @Override - public void done(boolean successful, long totalTimeMillis, String additionalInformation) { - compatExecutionMonitor.done(successful, totalTimeMillis, additionalInformation); - } - - @Override - public void check(StageExecution execution) { - compatExecutionMonitor.check(execution); - } - }; - } - public static UserFunctionSignature userFunctionSignature( QualifiedName name, List inputSignature,