Skip to content

Commit 5614215

Browse files
Add deprecated procedures service to GDS Facade
Co-authored-by: Ioannis Panagiotas <ioannis.panagiotas@neotechnology.com>
1 parent a924244 commit 5614215

File tree

9 files changed

+44
-16
lines changed

9 files changed

+44
-16
lines changed

proc/community/src/test/java/org/neo4j/gds/k1coloring/K1ColoringStreamProcTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,8 @@ void shouldRegisterTaskWithCorrectJobId() {
222222
null,
223223
algorithmsStreamBusinessFacade,
224224
null
225-
)
225+
),
226+
null
226227
);
227228
var someJobId = new JobId();
228229
Map<String, Object> configMap = Map.of("jobId", someJobId);

proc/community/src/test/java/org/neo4j/gds/labelpropagation/LabelPropagationMutateProcTest.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,8 @@ void testWriteBackGraphMutationOnFilteredGraph() {
326326
null,
327327
null,
328328
null
329-
)
329+
),
330+
null
330331
);
331332

332333
ProcedureMethodHelper.mutateMethods(procedure)
@@ -456,7 +457,8 @@ void testMutateFailsOnExistingToken() {
456457
null,
457458
null,
458459
null
459-
)
460+
),
461+
null
460462
);
461463

462464
ProcedureMethodHelper.mutateMethods(procedure)
@@ -515,7 +517,8 @@ void testRunOnEmptyGraph() {
515517
null,
516518
null,
517519
null
518-
)
520+
),
521+
null
519522
);
520523

521524
var methods = ProcedureMethodHelper.mutateMethods(procedure).collect(Collectors.toList());
@@ -577,7 +580,8 @@ private GraphStore runMutation(String graphName, Map<String, Object> config) {
577580
null,
578581
null,
579582
null
580-
)
583+
),
584+
null
581585
);
582586
ProcedureMethodHelper.mutateMethods(procedure)
583587
.forEach(mutateMethod -> {

proc/community/src/test/java/org/neo4j/gds/modularityoptimization/ModularityOptimizationMutateProcTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,8 @@ private GraphDataScience createFacade() {
595595
mock(CommunityAlgorithmsStatsBusinessFacade.class),
596596
mock(CommunityAlgorithmsStreamBusinessFacade.class),
597597
mock(CommunityAlgorithmsWriteBusinessFacade.class)
598-
)
598+
),
599+
null
599600
);
600601
}
601602
}

proc/community/src/test/java/org/neo4j/gds/wcc/WccMutateProcTest.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,8 @@ void testWriteBackGraphMutationOnFilteredGraph() {
356356
null,
357357
null,
358358
null
359-
)
359+
),
360+
null
360361
);
361362

362363
ProcedureMethodHelper.mutateMethods(procedure)
@@ -491,7 +492,8 @@ void testMutateFailsOnExistingToken() {
491492
null,
492493
null,
493494
null
494-
)
495+
),
496+
null
495497
);
496498
ProcedureMethodHelper.mutateMethods(procedure)
497499
.forEach(mutateMethod -> {
@@ -550,7 +552,8 @@ void testRunOnEmptyGraph() {
550552
null,
551553
null,
552554
null
553-
)
555+
),
556+
null
554557
);
555558

556559
var methods = ProcedureMethodHelper.mutateMethods(proc).collect(Collectors.toList());
@@ -633,7 +636,8 @@ private GraphStore runMutation(String graphName, Map<String, Object> additionalC
633636
null,
634637
null,
635638
null
636-
)
639+
),
640+
null
637641
);
638642
Map<String, Object> config = new HashMap<>(additionalConfig);
639643
config.put("mutateProperty", MUTATE_PROPERTY);

proc/community/src/test/java/org/neo4j/gds/wcc/WccStatsProcTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,8 @@ private GraphDataScience createFacade() {
299299
statsBusinessFacade,
300300
null,
301301
null
302-
)
302+
),
303+
null
303304
);
304305
}
305306

proc/community/src/test/java/org/neo4j/gds/wcc/WccWriteProcTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,8 @@ void testRunOnEmptyGraph() {
506506
null,
507507
null,
508508
algorithmsBusinessFacade
509-
)
509+
),
510+
null
510511
);
511512

512513
Map<String, Object> configMap = Map.of("writeProperty", WRITE_PROPERTY);

procedures/facade/src/main/java/org/neo4j/gds/procedures/GraphDataScience.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,26 @@
2020
package org.neo4j.gds.procedures;
2121

2222
import org.neo4j.gds.logging.Log;
23+
import org.neo4j.gds.metrics.procedures.DeprecatedProceduresMetricService;
2324
import org.neo4j.gds.procedures.catalog.CatalogFacade;
2425
import org.neo4j.gds.procedures.community.CommunityProcedureFacade;
2526

2627
public class GraphDataScience {
2728
private final Log log;
2829
private final CatalogFacade catalogFacade;
2930
private final CommunityProcedureFacade communityProcedureFacade;
31+
private final DeprecatedProceduresMetricService deprecatedProceduresMetricService;
3032

31-
public GraphDataScience(Log log, CatalogFacade catalogFacade, CommunityProcedureFacade communityProcedureFacade) {
33+
public GraphDataScience(
34+
Log log,
35+
CatalogFacade catalogFacade,
36+
CommunityProcedureFacade communityProcedureFacade,
37+
DeprecatedProceduresMetricService deprecatedProceduresMetricService
38+
) {
3239
this.log = log;
3340
this.catalogFacade = catalogFacade;
3441
this.communityProcedureFacade = communityProcedureFacade;
42+
this.deprecatedProceduresMetricService = deprecatedProceduresMetricService;
3543
}
3644

3745
public Log log() {
@@ -45,4 +53,8 @@ public CatalogFacade catalog() {
4553
public CommunityProcedureFacade community() {
4654
return communityProcedureFacade;
4755
}
56+
57+
public DeprecatedProceduresMetricService deprecatedProcedures() {
58+
return deprecatedProceduresMetricService;
59+
}
4860
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public ThrowingFunction<Context, GraphDataScience, ProcedureException> gdsProvid
207207
metricsFacade
208208
);
209209

210-
return new GraphDataScienceProvider(log, catalogFacadeProvider, communityProcedureProvider);
210+
return new GraphDataScienceProvider(log, catalogFacadeProvider, communityProcedureProvider, metricsFacade.deprecatedProcedures());
211211
}
212212

213213
private CatalogFacadeProvider createCatalogFacadeProvider(

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.neo4j.function.ThrowingFunction;
2323
import org.neo4j.gds.logging.Log;
24+
import org.neo4j.gds.metrics.procedures.DeprecatedProceduresMetricService;
2425
import org.neo4j.gds.procedures.GraphDataScience;
2526
import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
2627
import org.neo4j.kernel.api.procedure.Context;
@@ -32,22 +33,25 @@ public class GraphDataScienceProvider implements ThrowingFunction<Context, Graph
3233
private final Log log;
3334
private final CatalogFacadeProvider catalogFacadeProvider;
3435
private final CommunityProcedureProvider communityProcedureProvider;
36+
private final DeprecatedProceduresMetricService deprecatedProceduresMetricService;
3537

3638
public GraphDataScienceProvider(
3739
Log log,
3840
CatalogFacadeProvider catalogFacadeProvider,
39-
CommunityProcedureProvider communityProcedureProvider
41+
CommunityProcedureProvider communityProcedureProvider,
42+
DeprecatedProceduresMetricService deprecatedProceduresMetricService
4043
) {
4144
this.log = log;
4245
this.catalogFacadeProvider = catalogFacadeProvider;
4346
this.communityProcedureProvider = communityProcedureProvider;
47+
this.deprecatedProceduresMetricService = deprecatedProceduresMetricService;
4448
}
4549

4650
@Override
4751
public GraphDataScience apply(Context context) throws ProcedureException {
4852
var catalogFacade = catalogFacadeProvider.createCatalogFacade(context);
4953
var communityProcedureFacade = communityProcedureProvider.createCommunityProcedureFacade(context);
5054

51-
return new GraphDataScience(log, catalogFacade, communityProcedureFacade);
55+
return new GraphDataScience(log, catalogFacade, communityProcedureFacade, deprecatedProceduresMetricService);
5256
}
5357
}

0 commit comments

Comments
 (0)