Skip to content

Commit a0d3999

Browse files
committed
Remove superfluous highestNodeId on GdlFactory
1 parent 3a84c89 commit a0d3999

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ static GdlFactory gdlFactory(
9595
Optional<String> userName,
9696
Optional<String> graphName,
9797
Optional<GraphProjectFromGdlConfig> graphProjectConfig,
98-
Optional<Long> highestNodeId,
9998
Optional<LongSupplier> nodeIdFunction,
10099
Optional<Capabilities> graphCapabilities,
101100
Optional<String> idMapBuilderType
@@ -116,7 +115,7 @@ static GdlFactory gdlFactory(
116115
.setDefaultEdgeLabel(RelationshipType.ALL_RELATIONSHIPS.name)
117116
.buildFromString(config.gdlGraph());
118117

119-
var graphDimensions = GraphDimensionsGdlReader.of(gdlHandler, highestNodeId);
118+
var graphDimensions = GraphDimensionsGdlReader.of(gdlHandler);
120119

121120
// NOTE: We don't really have a database, but GDL is for testing to work as if we had a database
122121
var capabilities = graphCapabilities.orElseGet(() -> ImmutableStaticCapabilities.of(WriteMode.LOCAL));
@@ -187,6 +186,7 @@ public CSRGraphStore build() {
187186
private Nodes loadNodes() {
188187
var nodesBuilder = GraphFactory.initNodesBuilder()
189188
.maxOriginalId(dimensions.highestPossibleNodeCount() - 1)
189+
.nodeCount(gdlHandler.getVertices().size())
190190
.hasLabelInformation(true)
191191
.hasProperties(true)
192192
.deduplicateIds(false)
@@ -383,14 +383,14 @@ protected ProgressTracker progressTracker() {
383383

384384
private static final class GraphDimensionsGdlReader {
385385

386-
static GraphDimensions of(GDLHandler gdlHandler, Optional<Long> highestNodeId) {
386+
static GraphDimensions of(GDLHandler gdlHandler) {
387387
var nodeCount = gdlHandler.getVertices().size();
388-
var highestId = highestNodeId.orElseGet(() -> gdlHandler
388+
var highestId = gdlHandler
389389
.getVertices()
390390
.stream()
391391
.map(Vertex::getId)
392392
.max(Long::compareTo)
393-
.orElse((long) nodeCount));
393+
.orElse((long) nodeCount - 1);
394394
var relCount = gdlHandler.getEdges().size();
395395

396396
var nodePropertyDimensions = new HashMap<String, Optional<Integer>>();

0 commit comments

Comments
 (0)