Skip to content

Commit 68382f3

Browse files
illegalargument 2.6
1 parent 04630a1 commit 68382f3

File tree

8 files changed

+17
-16
lines changed

8 files changed

+17
-16
lines changed

algo/src/main/java/org/neo4j/gds/algorithms/runner/AlgorithmRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ <R> R runAlgorithm(Algorithm<R> algorithm, String algorithmName) {
146146
} catch (Exception e) {
147147
log.warn("Computation failed", e);
148148
algorithm.getProgressTracker().endSubTaskWithFailure();
149-
algorithmMetric.failed();
149+
algorithmMetric.failed(e);
150150
throw e;
151151
}
152152
}

algo/src/test/java/org/neo4j/gds/algorithms/runner/AlgorithmRunnerTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.neo4j.gds.metrics.algorithms.AlgorithmMetricsService;
2828

2929
import static org.assertj.core.api.Assertions.assertThatException;
30+
import static org.mockito.ArgumentMatchers.any;
3031
import static org.mockito.ArgumentMatchers.anyString;
3132
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
3233
import static org.mockito.Mockito.mock;
@@ -63,7 +64,7 @@ void shouldRegisterAlgorithmMetricCountForSuccess() {
6364
verify(algorithmMetricsServiceMock, times(1)).create("TestingMetrics");
6465
verify(algorithmMetricMock, times(1)).start();
6566
verify(algorithmMetricMock, times(1)).close();
66-
verify(algorithmMetricMock, times(0)).failed();
67+
verify(algorithmMetricMock, times(0)).failed(any());
6768
verifyNoMoreInteractions(
6869
algorithmMetricsServiceMock,
6970
algorithmMetricMock
@@ -103,7 +104,7 @@ void shouldRegisterAlgorithmMetricCountForFailure() {
103104
verify(algorithmMetricsServiceMock, times(1)).create("TestingMetrics");
104105
verify(algorithmMetricMock, times(1)).start();
105106
verify(algorithmMetricMock, times(1)).close();
106-
verify(algorithmMetricMock, times(1)).failed();
107+
verify(algorithmMetricMock, times(1)).failed(any());
107108
verifyNoMoreInteractions(
108109
algorithmMetricsServiceMock,
109110
algorithmMetricMock

applications/algorithms/path-finding/src/main/java/org/neo4j/gds/applications/algorithms/pathfinding/DefaultAlgorithmProcessingTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private <RESULT_FROM_ALGORITHM> RESULT_FROM_ALGORITHM computeWithMetric(
159159
return algorithmComputation.compute(graph);
160160
} catch (RuntimeException e) {
161161
log.warn("computation failed, halting metrics gathering", e);
162-
executionMetric.failed();
162+
executionMetric.failed(e);
163163
throw e;
164164
}
165165
}

applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/DefaultCatalogBusinessFacade.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,27 @@
2323
import org.neo4j.gds.api.DatabaseId;
2424
import org.neo4j.gds.api.GraphName;
2525
import org.neo4j.gds.api.User;
26+
import org.neo4j.gds.beta.filter.GraphFilterResult;
2627
import org.neo4j.gds.core.CypherMapWrapper;
2728
import org.neo4j.gds.core.loading.CatalogRequest;
2829
import org.neo4j.gds.core.loading.GraphDropNodePropertiesResult;
2930
import org.neo4j.gds.core.loading.GraphDropRelationshipResult;
30-
import org.neo4j.gds.beta.filter.GraphFilterResult;
3131
import org.neo4j.gds.core.loading.GraphStoreCatalogService;
3232
import org.neo4j.gds.core.loading.GraphStoreWithConfig;
33-
import org.neo4j.gds.termination.TerminationFlag;
3433
import org.neo4j.gds.core.utils.progress.TaskRegistryFactory;
3534
import org.neo4j.gds.core.utils.warnings.UserLogRegistryFactory;
3635
import org.neo4j.gds.core.write.NodeLabelExporterBuilder;
3736
import org.neo4j.gds.core.write.NodePropertyExporterBuilder;
3837
import org.neo4j.gds.core.write.RelationshipExporterBuilder;
3938
import org.neo4j.gds.core.write.RelationshipPropertiesExporterBuilder;
40-
import org.neo4j.gds.legacycypherprojection.GraphProjectCypherResult;
4139
import org.neo4j.gds.graphsampling.RandomWalkBasedNodesSampler;
4240
import org.neo4j.gds.graphsampling.config.RandomWalkWithRestartsConfig;
41+
import org.neo4j.gds.legacycypherprojection.GraphProjectCypherResult;
4342
import org.neo4j.gds.logging.Log;
4443
import org.neo4j.gds.metrics.projections.ProjectionMetricsService;
4544
import org.neo4j.gds.projection.GraphProjectNativeResult;
4645
import org.neo4j.gds.results.MemoryEstimateResult;
46+
import org.neo4j.gds.termination.TerminationFlag;
4747
import org.neo4j.gds.transaction.TransactionContext;
4848
import org.neo4j.graphdb.GraphDatabaseService;
4949

@@ -246,7 +246,7 @@ public GraphProjectNativeResult nativeProject(
246246
configuration
247247
);
248248
} catch (Exception e) {
249-
projectMetric.failed();
249+
projectMetric.failed(e);
250250
throw e;
251251
}
252252
}
@@ -319,7 +319,7 @@ public GraphProjectCypherResult cypherProject(
319319
configuration
320320
);
321321
} catch (Exception e) {
322-
projectMetric.failed();
322+
projectMetric.failed(e);
323323
throw e;
324324
}
325325
}
@@ -395,7 +395,7 @@ public GraphFilterResult subGraphProject(
395395
originGraphConfiguration.graphStore()
396396
);
397397
} catch (Exception e) {
398-
subGraphMetric.failed();
398+
subGraphMetric.failed(e);
399399
throw e;
400400
}
401401
}

cypher-aggregation/src/main/java/org/neo4j/gds/projection/GraphAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public AnyValue result() throws ProcedureException {
203203
projectionMetric.start();
204204
result = buildGraph();
205205
} catch (Exception e) {
206-
projectionMetric.failed();
206+
projectionMetric.failed(e);
207207
throw new ProcedureException(
208208
Status.Procedure.ProcedureCallFailed,
209209
e,

executor/src/main/java/org/neo4j/gds/executor/ProcedureExecutor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import org.neo4j.gds.api.GraphStore;
2828
import org.neo4j.gds.config.AlgoBaseConfig;
2929
import org.neo4j.gds.core.utils.ProgressTimer;
30+
import org.neo4j.gds.metrics.algorithms.AlgorithmMetricsService;
3031
import org.neo4j.gds.termination.TerminationFlag;
3132
import org.neo4j.graphdb.TransactionTerminatedException;
3233
import org.neo4j.kernel.api.exceptions.Status;
33-
import org.neo4j.gds.metrics.algorithms.AlgorithmMetricsService;
3434

3535
import java.util.Map;
3636
import java.util.Optional;
@@ -146,9 +146,9 @@ private ALGO_RESULT executeAlgorithm(
146146
) {
147147
algorithmMetric.start();
148148
return algo.compute();
149-
} catch (Throwable e) {
149+
} catch (Exception e) {
150150
algo.getProgressTracker().endSubTaskWithFailure();
151-
algorithmMetric.failed();
151+
algorithmMetric.failed(e);
152152
throw e;
153153
} finally {
154154
if (algoSpec.releaseProgressTask()) {

metrics-api/src/main/java/org/neo4j/gds/metrics/ExecutionMetric.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected ExecutionMetric(String operation) {
2929

3030
public abstract void start();
3131

32-
public abstract void failed();
32+
public abstract void failed(Exception e);
3333

3434
@Override
3535
public abstract void close();

metrics-api/src/main/java/org/neo4j/gds/metrics/PassthroughExecutionMetric.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public final class PassthroughExecutionMetric extends ExecutionMetric {
2929
public void start() {}
3030

3131
@Override
32-
public void failed() {}
32+
public void failed(Exception e) {}
3333

3434
@Override
3535
public void close() {}

0 commit comments

Comments
 (0)