Skip to content

Commit 0b2c90b

Browse files
s1cks1ck
committed
Rename IdMapAndProperties to NodeImportResult
1 parent 1059c1f commit 0b2c90b

File tree

8 files changed

+32
-32
lines changed

8 files changed

+32
-32
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.neo4j.gds.core.loading.CSRGraphStore;
2626
import org.neo4j.gds.core.loading.Capabilities;
2727
import org.neo4j.gds.core.loading.GraphStoreBuilder;
28-
import org.neo4j.gds.core.loading.IdMapAndProperties;
28+
import org.neo4j.gds.core.loading.NodeImportResult;
2929
import org.neo4j.gds.core.loading.RelationshipImportResult;
3030
import org.neo4j.gds.mem.MemoryUsage;
3131

@@ -43,15 +43,15 @@ public CSRGraphStoreFactory(
4343
}
4444

4545
protected CSRGraphStore createGraphStore(
46-
IdMapAndProperties idMapAndProperties,
46+
NodeImportResult nodeImportResult,
4747
RelationshipImportResult relationshipImportResult
4848
) {
4949
return new GraphStoreBuilder()
5050
.databaseId(DatabaseId.of(loadingContext.graphDatabaseService()))
5151
.capabilities(capabilities)
52-
.schema(computeGraphSchema(idMapAndProperties, relationshipImportResult))
53-
.nodes(idMapAndProperties.idMap())
54-
.nodePropertyStore(idMapAndProperties.properties())
52+
.schema(computeGraphSchema(nodeImportResult, relationshipImportResult))
53+
.nodes(nodeImportResult.idMap())
54+
.nodePropertyStore(nodeImportResult.properties())
5555
.relationships(relationshipImportResult.relationships())
5656
.relationshipPropertyStores(relationshipImportResult.properties())
5757
.concurrency(graphProjectConfig.readConcurrency())
@@ -65,7 +65,7 @@ protected void logLoadingSummary(GraphStore graphStore) {
6565
}
6666

6767
protected abstract GraphSchema computeGraphSchema(
68-
IdMapAndProperties idMapAndProperties,
68+
NodeImportResult nodeImportResult,
6969
RelationshipImportResult relationshipImportResult
7070
);
7171
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,14 @@ public static RelationshipPropertyStore buildRelationshipPropertyStore(
231231
}
232232

233233
public static GraphSchema computeGraphSchema(
234-
IdMapAndProperties idMapAndProperties,
234+
NodeImportResult nodeImportResult,
235235
Function<NodeLabel, Collection<String>> propertiesByLabel,
236236
RelationshipImportResult relationshipImportResult
237237
) {
238-
var properties = idMapAndProperties.properties().properties();
238+
var properties = nodeImportResult.properties().properties();
239239

240240
var nodeSchema = NodeSchema.empty();
241-
for (var label : idMapAndProperties.idMap().availableNodeLabels()) {
241+
for (var label : nodeImportResult.idMap().availableNodeLabels()) {
242242
var entry = nodeSchema.getOrCreateLabel(label);
243243
for (var propertyKey : propertiesByLabel.apply(label)) {
244244
entry.addProperty(
@@ -247,7 +247,7 @@ public static GraphSchema computeGraphSchema(
247247
);
248248
}
249249
}
250-
idMapAndProperties.idMap().availableNodeLabels().forEach(nodeSchema::getOrCreateLabel);
250+
nodeImportResult.idMap().availableNodeLabels().forEach(nodeSchema::getOrCreateLabel);
251251

252252
var relationshipSchema = RelationshipSchema.empty();
253253
relationshipImportResult

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

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

121121
@Override
122122
protected GraphSchema computeGraphSchema(
123-
IdMapAndProperties idMapAndProperties, RelationshipImportResult relationshipImportResult
123+
NodeImportResult nodeImportResult, RelationshipImportResult relationshipImportResult
124124
) {
125125
return CSRGraphStoreUtil.computeGraphSchema(
126-
idMapAndProperties,
127-
(__) -> idMapAndProperties.properties().keySet(),
126+
nodeImportResult,
127+
(__) -> nodeImportResult.properties().keySet(),
128128
relationshipImportResult
129129
);
130130
}

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

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

3636
@Value.Enclosing
37-
class CypherNodeLoader extends CypherRecordLoader<IdMapAndProperties> {
37+
class CypherNodeLoader extends CypherRecordLoader<NodeImportResult> {
3838

3939
private final long nodeCount;
4040
private final ProgressTracker progressTracker;
@@ -97,13 +97,13 @@ void updateCounts(BatchLoadResult result) {
9797
}
9898

9999
@Override
100-
IdMapAndProperties result() {
100+
NodeImportResult result() {
101101
var idMapAndProperties = nodesBuilder.build(highestNodeId);
102102
var idMap = idMapAndProperties.idMap();
103103
var nodeProperties = idMapAndProperties.nodeProperties().orElseGet(Map::of);
104104
var nodePropertiesWithPropertyMappings = propertiesWithPropertyMappings(nodeProperties);
105105

106-
return IdMapAndProperties.of(idMap, nodePropertiesWithPropertyMappings);
106+
return NodeImportResult.of(idMap, nodePropertiesWithPropertyMappings);
107107
}
108108

109109
@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,10 +227,10 @@ protected ProgressTracker initProgressTracker() {
227227

228228
@Override
229229
protected GraphSchema computeGraphSchema(
230-
IdMapAndProperties idMapAndProperties, RelationshipImportResult relationshipImportResult
230+
NodeImportResult nodeImportResult, RelationshipImportResult relationshipImportResult
231231
) {
232232
return CSRGraphStoreUtil.computeGraphSchema(
233-
idMapAndProperties,
233+
nodeImportResult,
234234
(label) -> storeConfig.nodeProjections().projections().get(label).properties().propertyKeys(),
235235
relationshipImportResult
236236
);
@@ -243,7 +243,7 @@ public CSRGraphStore build() {
243243
int concurrency = graphProjectConfig.readConcurrency();
244244
try {
245245
progressTracker.beginSubTask();
246-
IdMapAndProperties nodes = loadNodes(concurrency);
246+
NodeImportResult nodes = loadNodes(concurrency);
247247
RelationshipImportResult relationships = loadRelationships(nodes.idMap(), concurrency);
248248
CSRGraphStore graphStore = createGraphStore(nodes, relationships);
249249

@@ -255,7 +255,7 @@ public CSRGraphStore build() {
255255
}
256256
}
257257

258-
private IdMapAndProperties loadNodes(int concurrency) {
258+
private NodeImportResult loadNodes(int concurrency) {
259259
var scanningNodesImporter = new ScanningNodesImporterBuilder()
260260
.concurrency(concurrency)
261261
.graphProjectConfig(graphProjectConfig)

core/src/main/java/org/neo4j/gds/core/loading/IdMapAndProperties.java renamed to core/src/main/java/org/neo4j/gds/core/loading/NodeImportResult.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
import java.util.Map;
3131

3232
@ValueClass
33-
public interface IdMapAndProperties {
33+
public interface NodeImportResult {
3434

3535
IdMap idMap();
3636

3737
NodePropertyStore properties();
3838

39-
static IdMapAndProperties of(IdMap idMap, Map<PropertyMapping, NodePropertyValues> properties) {
39+
static NodeImportResult of(IdMap idMap, Map<PropertyMapping, NodePropertyValues> properties) {
4040
NodePropertyStore.Builder builder = NodePropertyStore.builder();
4141
properties.forEach((mapping, nodeProperties) -> builder.putProperty(
4242
mapping.propertyKey(),
@@ -49,6 +49,6 @@ static IdMapAndProperties of(IdMap idMap, Map<PropertyMapping, NodePropertyValue
4949
: nodeProperties.valueType().fallbackValue()
5050
)
5151
));
52-
return ImmutableIdMapAndProperties.of(idMap, builder.build());
52+
return ImmutableNodeImportResult.of(idMap, builder.build());
5353
}
5454
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
4848

49-
public final class ScanningNodesImporter extends ScanningRecordsImporter<NodeReference, IdMapAndProperties> {
49+
public final class ScanningNodesImporter extends ScanningRecordsImporter<NodeReference, NodeImportResult> {
5050

5151
private final IndexPropertyMappings.LoadablePropertyMappings propertyMappings;
5252
private final TerminationFlag terminationFlag;
@@ -172,7 +172,7 @@ public RecordScannerTaskRunner.RecordScannerTaskFactory recordScannerTaskFactory
172172
}
173173

174174
@Override
175-
public IdMapAndProperties build() {
175+
public NodeImportResult build() {
176176
var idMap = idMapBuilder.build(
177177
labelInformationBuilder,
178178
Math.max(dimensions.highestPossibleNodeCount() - 1, 0),
@@ -187,7 +187,7 @@ public IdMapAndProperties build() {
187187
importPropertiesFromIndex(idMap, nodeProperties);
188188
}
189189

190-
return IdMapAndProperties.of(idMap, nodeProperties);
190+
return NodeImportResult.of(idMap, nodeProperties);
191191
}
192192

193193
private void importPropertiesFromIndex(

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
import org.neo4j.gds.core.loading.CSRGraphStore;
4848
import org.neo4j.gds.core.loading.Capabilities;
4949
import org.neo4j.gds.core.loading.GraphStoreBuilder;
50-
import org.neo4j.gds.core.loading.IdMapAndProperties;
5150
import org.neo4j.gds.core.loading.ImmutableRelationshipImportResult;
5251
import org.neo4j.gds.core.loading.ImmutableStaticCapabilities;
52+
import org.neo4j.gds.core.loading.NodeImportResult;
5353
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;
@@ -173,9 +173,9 @@ protected ProgressTracker initProgressTracker() {
173173

174174
@Override
175175
protected GraphSchema computeGraphSchema(
176-
IdMapAndProperties idMapAndProperties, RelationshipImportResult relationshipImportResult
176+
NodeImportResult nodeImportResult, RelationshipImportResult relationshipImportResult
177177
) {
178-
var nodeProperties = idMapAndProperties.properties();
178+
var nodeProperties = nodeImportResult.properties();
179179
var nodeSchema = NodeSchema.empty();
180180
gdlHandler
181181
.getVertices()
@@ -197,7 +197,7 @@ protected GraphSchema computeGraphSchema(
197197
);
198198
});
199199
// in case there were no properties add all labels
200-
idMapAndProperties.idMap().availableNodeLabels().forEach(nodeSchema::getOrCreateLabel);
200+
nodeImportResult.idMap().availableNodeLabels().forEach(nodeSchema::getOrCreateLabel);
201201

202202
var relationshipSchema = RelationshipSchema.empty();
203203
relationshipImportResult
@@ -280,7 +280,7 @@ public CSRGraphStore build() {
280280
.build();
281281
}
282282

283-
private IdMapAndProperties loadNodes() {
283+
private NodeImportResult loadNodes() {
284284
var nodesBuilder = GraphFactory.initNodesBuilder()
285285
.maxOriginalId(dimensions.highestPossibleNodeCount() - 1)
286286
.hasLabelInformation(true)
@@ -303,7 +303,7 @@ private IdMapAndProperties loadNodes() {
303303

304304
var idMap = nodesBuilder.build().idMap();
305305

306-
return IdMapAndProperties.of(idMap, loadNodeProperties(idMap));
306+
return NodeImportResult.of(idMap, loadNodeProperties(idMap));
307307
}
308308

309309
private Map<PropertyMapping, NodePropertyValues> loadNodeProperties(IdMap idMap) {

0 commit comments

Comments
 (0)