Skip to content

Commit 1059c1f

Browse files
s1cks1ck
committed
Rename RelationshipsAndProperties to RelationshipImportResult
1 parent 2e0e342 commit 1059c1f

File tree

8 files changed

+41
-38
lines changed

8 files changed

+41
-38
lines changed

‎core/src/main/java/org/neo4j/gds/api/CSRGraphStoreFactory.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.neo4j.gds.core.loading.Capabilities;
2727
import org.neo4j.gds.core.loading.GraphStoreBuilder;
2828
import org.neo4j.gds.core.loading.IdMapAndProperties;
29-
import org.neo4j.gds.core.loading.RelationshipsAndProperties;
29+
import org.neo4j.gds.core.loading.RelationshipImportResult;
3030
import org.neo4j.gds.mem.MemoryUsage;
3131

3232
import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
@@ -44,16 +44,16 @@ public CSRGraphStoreFactory(
4444

4545
protected CSRGraphStore createGraphStore(
4646
IdMapAndProperties idMapAndProperties,
47-
RelationshipsAndProperties relationshipsAndProperties
47+
RelationshipImportResult relationshipImportResult
4848
) {
4949
return new GraphStoreBuilder()
5050
.databaseId(DatabaseId.of(loadingContext.graphDatabaseService()))
5151
.capabilities(capabilities)
52-
.schema(computeGraphSchema(idMapAndProperties, relationshipsAndProperties))
52+
.schema(computeGraphSchema(idMapAndProperties, relationshipImportResult))
5353
.nodes(idMapAndProperties.idMap())
5454
.nodePropertyStore(idMapAndProperties.properties())
55-
.relationships(relationshipsAndProperties.relationships())
56-
.relationshipPropertyStores(relationshipsAndProperties.properties())
55+
.relationships(relationshipImportResult.relationships())
56+
.relationshipPropertyStores(relationshipImportResult.properties())
5757
.concurrency(graphProjectConfig.readConcurrency())
5858
.build();
5959
}
@@ -64,5 +64,8 @@ protected void logLoadingSummary(GraphStore graphStore) {
6464
progressTracker.logInfo(formatWithLocale("Actual memory usage of the loaded graph: %s", memoryUsage));
6565
}
6666

67-
protected abstract GraphSchema computeGraphSchema(IdMapAndProperties idMapAndProperties, RelationshipsAndProperties relationshipsAndProperties);
67+
protected abstract GraphSchema computeGraphSchema(
68+
IdMapAndProperties idMapAndProperties,
69+
RelationshipImportResult relationshipImportResult
70+
);
6871
}

‎core/src/main/java/org/neo4j/gds/core/loading/CSRGraphStoreUtil.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public static RelationshipPropertyStore buildRelationshipPropertyStore(
233233
public static GraphSchema computeGraphSchema(
234234
IdMapAndProperties idMapAndProperties,
235235
Function<NodeLabel, Collection<String>> propertiesByLabel,
236-
RelationshipsAndProperties relationshipsAndProperties
236+
RelationshipImportResult relationshipImportResult
237237
) {
238238
var properties = idMapAndProperties.properties().properties();
239239

@@ -250,12 +250,12 @@ public static GraphSchema computeGraphSchema(
250250
idMapAndProperties.idMap().availableNodeLabels().forEach(nodeSchema::getOrCreateLabel);
251251

252252
var relationshipSchema = RelationshipSchema.empty();
253-
relationshipsAndProperties
253+
relationshipImportResult
254254
.properties()
255255
.forEach((relType, propertyStore) -> {
256256
var entry = relationshipSchema.getOrCreateRelationshipType(
257257
relType,
258-
relationshipsAndProperties.directions().get(relType)
258+
relationshipImportResult.directions().get(relType)
259259
);
260260

261261
propertyStore
@@ -266,13 +266,13 @@ public static GraphSchema computeGraphSchema(
266266
));
267267
});
268268

269-
relationshipsAndProperties
269+
relationshipImportResult
270270
.relationships()
271271
.keySet()
272272
.forEach(type -> {
273273
relationshipSchema.getOrCreateRelationshipType(
274274
type,
275-
relationshipsAndProperties.directions().get(type)
275+
relationshipImportResult.directions().get(type)
276276
);
277277
});
278278

‎core/src/main/java/org/neo4j/gds/core/loading/CypherFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ public GraphDimensions estimationDimensions() {
120120

121121
@Override
122122
protected GraphSchema computeGraphSchema(
123-
IdMapAndProperties idMapAndProperties, RelationshipsAndProperties relationshipsAndProperties
123+
IdMapAndProperties idMapAndProperties, RelationshipImportResult relationshipImportResult
124124
) {
125125
return CSRGraphStoreUtil.computeGraphSchema(
126126
idMapAndProperties,
127127
(__) -> idMapAndProperties.properties().keySet(),
128-
relationshipsAndProperties
128+
relationshipImportResult
129129
);
130130
}
131131

‎core/src/main/java/org/neo4j/gds/core/loading/CypherRelationshipLoader.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import java.util.stream.Collectors;
4646

4747
@Value.Enclosing
48-
class CypherRelationshipLoader extends CypherRecordLoader<RelationshipsAndProperties> {
48+
class CypherRelationshipLoader extends CypherRecordLoader<RelationshipImportResult> {
4949

5050
private final IdMap idMap;
5151
private final Context loaderContext;
@@ -133,16 +133,16 @@ BatchLoadResult loadSingleBatch(InternalTransaction tx, int bufferSize) {
133133
void updateCounts(BatchLoadResult result) {}
134134

135135
@Override
136-
RelationshipsAndProperties result() {
136+
RelationshipImportResult result() {
137137
var relationshipsByType = loaderContext.relationshipBuildersByType.entrySet().stream().collect(Collectors.toMap(
138138
entry -> {
139139
var projection = projectionBuilder.type(entry.getKey().name).build();
140-
return RelationshipsAndProperties.RelationshipTypeAndProjection.of(entry.getKey(), projection);
140+
return RelationshipImportResult.RelationshipTypeAndProjection.of(entry.getKey(), projection);
141141
},
142142
entry -> entry.getValue().buildAll()
143143
));
144144

145-
return RelationshipsAndProperties.of(relationshipsByType);
145+
return RelationshipImportResult.of(relationshipsByType);
146146
}
147147

148148
@Override

‎core/src/main/java/org/neo4j/gds/core/loading/NativeFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,12 @@ protected ProgressTracker initProgressTracker() {
227227

228228
@Override
229229
protected GraphSchema computeGraphSchema(
230-
IdMapAndProperties idMapAndProperties, RelationshipsAndProperties relationshipsAndProperties
230+
IdMapAndProperties idMapAndProperties, RelationshipImportResult relationshipImportResult
231231
) {
232232
return CSRGraphStoreUtil.computeGraphSchema(
233233
idMapAndProperties,
234234
(label) -> storeConfig.nodeProjections().projections().get(label).properties().propertyKeys(),
235-
relationshipsAndProperties
235+
relationshipImportResult
236236
);
237237
}
238238

@@ -244,7 +244,7 @@ public CSRGraphStore build() {
244244
try {
245245
progressTracker.beginSubTask();
246246
IdMapAndProperties nodes = loadNodes(concurrency);
247-
RelationshipsAndProperties relationships = loadRelationships(nodes.idMap(), concurrency);
247+
RelationshipImportResult relationships = loadRelationships(nodes.idMap(), concurrency);
248248
CSRGraphStore graphStore = createGraphStore(nodes, relationships);
249249

250250
logLoadingSummary(graphStore);
@@ -272,7 +272,7 @@ private IdMapAndProperties loadNodes(int concurrency) {
272272
}
273273
}
274274

275-
private RelationshipsAndProperties loadRelationships(IdMap idMap, int concurrency) {
275+
private RelationshipImportResult loadRelationships(IdMap idMap, int concurrency) {
276276
var scanningRelationshipsImporter = new ScanningRelationshipsImporterBuilder()
277277
.idMap(idMap)
278278
.graphProjectConfig(graphProjectConfig)

core/src/main/java/org/neo4j/gds/core/loading/RelationshipsAndProperties.java renamed to core/src/main/java/org/neo4j/gds/core/loading/RelationshipImportResult.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import java.util.stream.Collectors;
4545

4646
@ValueClass
47-
public interface RelationshipsAndProperties {
47+
public interface RelationshipImportResult {
4848

4949
@Value.Default
5050
default Map<RelationshipType, Relationships.Topology> relationships() {
@@ -88,7 +88,7 @@ default Map<RelationshipType, SingleTypeRelationshipImportResult> importResults(
8888
return Map.of();
8989
}
9090

91-
static RelationshipsAndProperties of(Map<RelationshipTypeAndProjection, List<RelationshipsAndDirection>> relationshipsByType) {
91+
static RelationshipImportResult of(Map<RelationshipTypeAndProjection, List<RelationshipsAndDirection>> relationshipsByType) {
9292
var relTypeCount = relationshipsByType.size();
9393
Map<RelationshipType, Relationships.Topology> topologies = new HashMap<>(relTypeCount);
9494
Map<RelationshipType, RelationshipPropertyStore> relationshipPropertyStores = new HashMap<>(relTypeCount);
@@ -119,15 +119,15 @@ static RelationshipsAndProperties of(Map<RelationshipTypeAndProjection, List<Rel
119119
directions.put(relationshipTypeAndProjection.relationshipType(), Direction.fromOrientation(orientation));
120120
});
121121

122-
return ImmutableRelationshipsAndProperties.builder()
122+
return ImmutableRelationshipImportResult.builder()
123123
.relationships(topologies)
124124
.properties(relationshipPropertyStores)
125125
.directions(directions)
126126
.build();
127127
}
128128

129129
/**
130-
* This method creates the final {@link org.neo4j.gds.core.loading.RelationshipsAndProperties} in preparation
130+
* This method creates the final {@link RelationshipImportResult} in preparation
131131
* for the {@link org.neo4j.gds.api.GraphStore}.
132132
* <p>
133133
* The method is used in the context of native projection, where each projected relationship type (and its
@@ -136,7 +136,7 @@ static RelationshipsAndProperties of(Map<RelationshipTypeAndProjection, List<Rel
136136
* @param importContexts each import context maps to a relationship type being created
137137
* @return a wrapper type ready to be consumed by a {@link org.neo4j.gds.api.GraphStore}
138138
*/
139-
static RelationshipsAndProperties of(Collection<SingleTypeRelationshipImporter.SingleTypeRelationshipImportContext> importContexts) {
139+
static RelationshipImportResult of(Collection<SingleTypeRelationshipImporter.SingleTypeRelationshipImportContext> importContexts) {
140140
var builders = new HashMap<RelationshipType, ImmutableSingleTypeRelationshipImportResult.Builder>(importContexts.size());
141141

142142
importContexts.forEach((importContext) -> {
@@ -175,7 +175,7 @@ static RelationshipsAndProperties of(Collection<SingleTypeRelationshipImporter.S
175175
e -> e.getValue().build()
176176
));
177177

178-
return ImmutableRelationshipsAndProperties.builder()
178+
return ImmutableRelationshipImportResult.builder()
179179
.importResults(importResults)
180180
.build();
181181
}

‎core/src/main/java/org/neo4j/gds/core/loading/ScanningRelationshipsImporter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import java.util.stream.Collectors;
3636

3737

38-
public final class ScanningRelationshipsImporter extends ScanningRecordsImporter<RelationshipReference, RelationshipsAndProperties> {
38+
public final class ScanningRelationshipsImporter extends ScanningRecordsImporter<RelationshipReference, RelationshipImportResult> {
3939

4040
private final GraphProjectFromStoreConfig graphProjectConfig;
4141
private final GraphLoaderContext loadingContext;
@@ -172,7 +172,7 @@ private SingleTypeRelationshipImportContext createInverseImporterContext(
172172
}
173173

174174
@Override
175-
public RelationshipsAndProperties build() {
176-
return RelationshipsAndProperties.of(importContexts);
175+
public RelationshipImportResult build() {
176+
return RelationshipImportResult.of(importContexts);
177177
}
178178
}

‎test-utils/src/main/java/org/neo4j/gds/gdl/GdlFactory.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
import org.neo4j.gds.core.loading.Capabilities;
4949
import org.neo4j.gds.core.loading.GraphStoreBuilder;
5050
import org.neo4j.gds.core.loading.IdMapAndProperties;
51-
import org.neo4j.gds.core.loading.ImmutableRelationshipsAndProperties;
51+
import org.neo4j.gds.core.loading.ImmutableRelationshipImportResult;
5252
import org.neo4j.gds.core.loading.ImmutableStaticCapabilities;
53-
import org.neo4j.gds.core.loading.RelationshipsAndProperties;
53+
import org.neo4j.gds.core.loading.RelationshipImportResult;
5454
import org.neo4j.gds.core.loading.construction.GraphFactory;
5555
import org.neo4j.gds.core.loading.construction.NodeLabelTokens;
5656
import org.neo4j.gds.core.loading.construction.RelationshipsBuilder;
@@ -173,7 +173,7 @@ protected ProgressTracker initProgressTracker() {
173173

174174
@Override
175175
protected GraphSchema computeGraphSchema(
176-
IdMapAndProperties idMapAndProperties, RelationshipsAndProperties relationshipsAndProperties
176+
IdMapAndProperties idMapAndProperties, RelationshipImportResult relationshipImportResult
177177
) {
178178
var nodeProperties = idMapAndProperties.properties();
179179
var nodeSchema = NodeSchema.empty();
@@ -200,12 +200,12 @@ protected GraphSchema computeGraphSchema(
200200
idMapAndProperties.idMap().availableNodeLabels().forEach(nodeSchema::getOrCreateLabel);
201201

202202
var relationshipSchema = RelationshipSchema.empty();
203-
relationshipsAndProperties
203+
relationshipImportResult
204204
.properties()
205205
.forEach((relType, propertyStore) -> propertyStore
206206
.relationshipProperties()
207207
.forEach((propertyKey, propertyValues) -> relationshipSchema
208-
.getOrCreateRelationshipType(relType, relationshipsAndProperties.directions().get(relType))
208+
.getOrCreateRelationshipType(relType, relationshipImportResult.directions().get(relType))
209209
.addProperty(
210210
propertyKey,
211211
RelationshipPropertySchema.of(
@@ -218,12 +218,12 @@ protected GraphSchema computeGraphSchema(
218218
)
219219
)
220220
);
221-
relationshipsAndProperties
221+
relationshipImportResult
222222
.relationships()
223223
.keySet()
224224
.forEach(type -> relationshipSchema.getOrCreateRelationshipType(
225225
type,
226-
relationshipsAndProperties.directions().get(type)
226+
relationshipImportResult.directions().get(type)
227227
));
228228

229229
return GraphSchema.of(
@@ -265,7 +265,7 @@ public CSRGraphStore build() {
265265

266266
var schema = computeGraphSchema(
267267
nodes,
268-
ImmutableRelationshipsAndProperties.of(topologies, properties, directions)
268+
ImmutableRelationshipImportResult.of(topologies, properties, directions)
269269
);
270270

271271
return new GraphStoreBuilder()

0 commit comments

Comments
 (0)