Skip to content

Commit 351eaaa

Browse files
s1cksoerenreichardt
andcommitted
Clean up GDLFactory
Co-authored-by: Sören Reichardt <soren.reichardt@neotechnology.com>
1 parent ea6e34a commit 351eaaa

File tree

1 file changed

+1
-56
lines changed

1 file changed

+1
-56
lines changed

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

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.immutables.builder.Builder;
2323
import org.jetbrains.annotations.NotNull;
2424
import org.neo4j.gds.NodeLabel;
25-
import org.neo4j.gds.PropertyMapping;
2625
import org.neo4j.gds.RelationshipType;
2726
import org.neo4j.gds.api.CSRGraphStoreFactory;
2827
import org.neo4j.gds.api.DatabaseId;
@@ -31,7 +30,6 @@
3130
import org.neo4j.gds.api.IdMap;
3231
import org.neo4j.gds.api.PropertyState;
3332
import org.neo4j.gds.api.nodeproperties.ValueType;
34-
import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
3533
import org.neo4j.gds.api.schema.Direction;
3634
import org.neo4j.gds.api.schema.GraphSchema;
3735
import org.neo4j.gds.api.schema.RelationshipSchema;
@@ -49,7 +47,6 @@
4947
import org.neo4j.gds.core.loading.construction.NodeLabelTokens;
5048
import org.neo4j.gds.core.loading.construction.PropertyValues;
5149
import org.neo4j.gds.core.loading.construction.RelationshipsBuilder;
52-
import org.neo4j.gds.core.loading.nodeproperties.NodePropertiesFromStoreBuilder;
5350
import org.neo4j.gds.core.utils.mem.MemoryEstimation;
5451
import org.neo4j.gds.core.utils.mem.MemoryEstimations;
5552
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
@@ -165,34 +162,6 @@ protected ProgressTracker initProgressTracker() {
165162

166163
@Override
167164
protected GraphSchema computeGraphSchema(Nodes nodes, RelationshipImportResult relationshipImportResult) {
168-
// var nodeProperties = nodes.properties();
169-
// var nodeSchema = NodeSchema.empty();
170-
// gdlHandler
171-
// .getVertices()
172-
// .forEach(vertex -> {
173-
// var labels = vertex.getLabels().stream().map(NodeLabel::of).collect(Collectors.toList());
174-
// if (labels.isEmpty()) {
175-
// labels = List.of(NodeLabel.ALL_NODES);
176-
// }
177-
//
178-
// labels.forEach(label -> vertex
179-
// .getProperties()
180-
// .forEach((propertyKey, propertyValue) -> nodeSchema
181-
// .getOrCreateLabel(label)
182-
// .addProperty(
183-
// propertyKey,
184-
// PropertySchema.of(
185-
// propertyKey,
186-
// nodeProperties.get(propertyKey).valueType(),
187-
// nodeProperties.get(propertyKey).defaultValue(),
188-
// nodeProperties.get(propertyKey).propertyState()
189-
// )
190-
// )
191-
// ));
192-
// });
193-
// // in case there were no properties add all labels
194-
// nodes.idMap().availableNodeLabels().forEach(nodeSchema::getOrCreateLabel);
195-
196165
var relationshipSchema = relationshipImportResult.importResults().entrySet().stream().reduce(
197166
RelationshipSchema.empty(),
198167
(unionSchema, entry) -> {
@@ -259,31 +228,7 @@ private Nodes loadNodes() {
259228
);
260229
});
261230

262-
var nodes = nodesBuilder.build();
263-
return Nodes.of(nodes.schema(), nodes.idMap(), loadNodeProperties(nodes.idMap()), graphProjectConfig.propertyState());
264-
}
265-
266-
private Map<PropertyMapping, NodePropertyValues> loadNodeProperties(IdMap idMap) {
267-
var propertyBuilders = new HashMap<PropertyMapping, NodePropertiesFromStoreBuilder>();
268-
269-
gdlHandler.getVertices().forEach(vertex -> vertex
270-
.getProperties()
271-
.forEach((propertyKey, propertyValue) -> {
272-
if (propertyValue instanceof List) {
273-
propertyValue = convertListProperty((List<?>) propertyValue);
274-
}
275-
276-
propertyBuilders.computeIfAbsent(PropertyMapping.of(propertyKey), (key) ->
277-
NodePropertiesFromStoreBuilder.of(
278-
DefaultValue.DEFAULT,
279-
1
280-
)).set(vertex.getId(), Values.of(propertyValue));
281-
}));
282-
283-
return propertyBuilders
284-
.entrySet()
285-
.stream()
286-
.collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().build(idMap)));
231+
return nodesBuilder.build();
287232
}
288233

289234
@NotNull

0 commit comments

Comments
 (0)