Skip to content

Commit ca54780

Browse files
Demolish stats inheritence everywhere; probablly destroy everything else
1 parent 71ab4b1 commit ca54780

File tree

42 files changed

+179
-638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+179
-638
lines changed

proc/pregel/src/main/java/org/neo4j/gds/pregel/proc/PregelStatsResult.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@
1919
*/
2020
package org.neo4j.gds.pregel.proc;
2121

22-
import org.neo4j.gds.procedures.algorithms.results.StandardStatsResult;
23-
2422
import java.util.Map;
2523

2624
@SuppressWarnings("unused")
27-
public final class PregelStatsResult extends StandardStatsResult {
25+
public final class PregelStatsResult {
2826

27+
public final long preProcessingMillis;
28+
public final long computeMillis;
29+
public final Map<String, Object> configuration;
2930
public final long ranIterations;
3031
public final boolean didConverge;
32+
public final long postProcessingMillis;
3133

3234
private PregelStatsResult(
3335
long preProcessingMillis,
@@ -36,16 +38,25 @@ private PregelStatsResult(
3638
boolean didConverge,
3739
Map<String, Object> configuration
3840
) {
39-
super(preProcessingMillis, computeMillis, 0L, configuration);
4041
this.ranIterations = ranIterations;
4142
this.didConverge = didConverge;
43+
this.preProcessingMillis = preProcessingMillis;
44+
this.postProcessingMillis = 0;
45+
this.computeMillis = computeMillis;
46+
this.configuration = configuration;
4247
}
4348

4449
public static class Builder extends AbstractPregelResultBuilder<PregelStatsResult> {
4550

4651
@Override
4752
public PregelStatsResult build() {
48-
return new PregelStatsResult(preProcessingMillis, computeMillis, ranIterations, didConverge, config.toMap());
53+
return new PregelStatsResult(
54+
preProcessingMillis,
55+
computeMillis,
56+
ranIterations,
57+
didConverge,
58+
config.toMap()
59+
);
4960
}
5061
}
5162
}

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/BetaClosenessCentralityResultBuilderForWriteMode.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ public Stream<BetaClosenessCentralityWriteResult> build(
5757

5858
return Stream.of(
5959
new BetaClosenessCentralityWriteResult(
60-
writeResult.nodePropertiesWritten,
61-
writeResult.preProcessingMillis,
62-
writeResult.computeMillis,
63-
writeResult.postProcessingMillis,
64-
writeResult.writeMillis,
60+
writeResult.nodePropertiesWritten(),
61+
writeResult.preProcessingMillis(),
62+
writeResult.computeMillis(),
63+
writeResult.postProcessingMillis(),
64+
writeResult.writeMillis(),
6565
configuration.writeProperty(),
66-
writeResult.centralityDistribution,
67-
writeResult.configuration
66+
writeResult.centralityDistribution(),
67+
writeResult.configuration()
6868
)
6969
);
7070
}

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/GenericCentralityResultBuilderForStatsMode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public <CONFIGURATION extends ConcurrencyConfig & ToMapConvertible> CentralitySt
3939
) {
4040
var configurationMap = configuration.toMap();
4141

42-
if (result.isEmpty()) return CentralityMutateResult.emptyFrom(timings, configurationMap);
42+
if (result.isEmpty()) return CentralityStatsResult.emptyFrom(timings, configurationMap);
4343

4444
var centralityAlgorithmResult = result.get();
4545

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/stubs/BetaClosenessCentralityResultBuilderForMutateMode.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ public BetaClosenessCentralityMutateResult build(
5656
);
5757

5858
return new BetaClosenessCentralityMutateResult(
59-
centralityMutateResult.nodePropertiesWritten,
60-
centralityMutateResult.preProcessingMillis,
61-
centralityMutateResult.computeMillis,
62-
centralityMutateResult.postProcessingMillis,
63-
centralityMutateResult.mutateMillis,
59+
centralityMutateResult.nodePropertiesWritten(),
60+
centralityMutateResult.preProcessingMillis(),
61+
centralityMutateResult.computeMillis(),
62+
centralityMutateResult.postProcessingMillis(),
63+
centralityMutateResult.mutateMillis(),
6464
configuration.mutateProperty(),
65-
centralityMutateResult.centralityDistribution,
66-
centralityMutateResult.configuration
65+
centralityMutateResult.centralityDistribution(),
66+
centralityMutateResult.configuration()
6767
);
6868
}
6969
}

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/ScalePropertiesResultBuilderForStatsMode.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@ public Stream<ScalePropertiesStatsResult> build(
5050

5151
var scalePropertiesResult = result.get();
5252

53-
var scalePropertiesStatsResult = new ScalePropertiesStatsResult(
53+
var scalePropertiesStatsResult = ScalePropertiesStatsResult.create(
5454
shouldDisplayScalerStatistics ? scalePropertiesResult.scalerStatistics() : null,
55-
timings.preProcessingMillis,
56-
timings.computeMillis,
55+
timings,
5756
configuration.toMap()
5857
);
5958

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/results/StandardModeResult.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/results/StandardMutateResult.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/results/StandardStatsResult.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/results/StandardWriteResult.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

procedures/facade-api/algorithms-facade-common/src/main/java/org/neo4j/gds/procedures/algorithms/results/StandardMutateResult.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121

2222
import java.util.Map;
2323

24-
public class StandardMutateResult extends StandardStatsResult {
24+
public class StandardMutateResult {
2525
public final long mutateMillis;
26+
public final long preProcessingMillis;
27+
public final long computeMillis;
28+
public final long postProcessingMillis;
29+
public final Map<String, Object> configuration;
2630

2731
public StandardMutateResult(
2832
long preProcessingMillis,
@@ -31,7 +35,10 @@ public StandardMutateResult(
3135
long mutateMillis,
3236
Map<String, Object> configuration
3337
) {
34-
super(preProcessingMillis, computeMillis, postProcessingMillis, configuration);
3538
this.mutateMillis = mutateMillis;
39+
this.postProcessingMillis = postProcessingMillis;
40+
this.preProcessingMillis = preProcessingMillis;
41+
this.configuration = configuration;
42+
this.computeMillis = computeMillis;
3643
}
3744
}

0 commit comments

Comments
 (0)