Skip to content

Commit 1421b13

Browse files
authored
Merge pull request #10698 from DarthMax/🍰_use_AV2_for_projectons
🍰 - Use AV2 for projectons
2 parents d13f1d8 + 7248901 commit 1421b13

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public UserFunctionSignature signature() {
7171

7272
// NOTE: keep in sync with `FUNCTION_NAME` and `signature`
7373
@CustomProcedure(value = "gds.alpha.graph.project", namespace = CustomProcedure.Namespace.AGGREGATION_FUNCTION)
74-
public AggregationResult procedureSyntax(
74+
public ProjectionResult procedureSyntax(
7575
@Name("graphName") TextValue graphName,
7676
@Name("sourceNode") AnyValue sourceNode,
7777
@Name("targetNode") AnyValue targetNode,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public UserFunctionSignature signature() {
7070

7171
// NOTE: keep in sync with `FUNCTION_NAME` and `signature`
7272
@CustomProcedure(value = "gds.graph.project", namespace = CustomProcedure.Namespace.AGGREGATION_FUNCTION)
73-
public AggregationResult procedureSyntax(
73+
public ProjectionResult procedureSyntax(
7474
@Name("graphName") TextValue graphName,
7575
@Name("sourceNode") AnyValue sourceNode,
7676
@Name("targetNode") AnyValue targetNode,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ abstract class GraphAggregator implements UserAggregationReducer, UserAggregatio
9999
private volatile @Nullable GraphImporter importer;
100100

101101
// #result() may be called twice, we cache the result of the first call to return it again in the second invocation
102-
private @Nullable AggregationResult result;
102+
private @Nullable ProjectionResult result;
103103
private ProgressTracker progressTracker;
104104

105105
GraphAggregator(
@@ -281,7 +281,7 @@ public void applyUpdates() {
281281
@Override
282282
public AnyValue result() throws ProcedureException {
283283
var projectionMetric = projectionMetricsService.createCypherV2();
284-
AggregationResult result;
284+
ProjectionResult result;
285285
try (projectionMetric) {
286286
projectionMetric.start();
287287
result = buildGraph();
@@ -314,7 +314,7 @@ public AnyValue result() throws ProcedureException {
314314
return projectResult;
315315
}
316316

317-
public @Nullable AggregationResult buildGraph() {
317+
public @Nullable ProjectionResult buildGraph() {
318318
var importer = this.importer;
319319
if (importer == null) {
320320
// Nothing aggregated

triplet-graph-builder/src/main/java/org/neo4j/gds/projection/GraphImporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public void update(
161161
progressTracker.logProgress();
162162
}
163163

164-
public AggregationResult result(
164+
public ProjectionResult result(
165165
DatabaseInfo databaseInfo,
166166
ProgressTimer timer,
167167
boolean hasSeenArbitraryId
@@ -213,7 +213,7 @@ public AggregationResult result(
213213
progressTracker.endSubTask("Build graph store");
214214
progressTracker.endSubTask("Graph aggregation");
215215

216-
return AggregationResultBuilder.builder()
216+
return ProjectionResultBuilder.builder()
217217
.graphName(graphName)
218218
.nodeCount(graphStore.nodeCount())
219219
.relationshipCount(graphStore.relationshipCount())

triplet-graph-builder/src/main/java/org/neo4j/gds/projection/AggregationResult.java renamed to triplet-graph-builder/src/main/java/org/neo4j/gds/projection/ProjectionResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.Map;
2525

2626
@GenerateBuilder
27-
public record AggregationResult(
27+
public record ProjectionResult(
2828
String graphName,
2929
long nodeCount,
3030
long relationshipCount,

0 commit comments

Comments
 (0)