Skip to content

Commit fce4f56

Browse files
s1cksoerenreichardt
andcommitted
Verify that UNKNOWN_MAX_ID is handled correctly
Co-Authored-By: Sören Reichardt <soren.reichardt@neotechnology.com>
1 parent 6dce746 commit fce4f56

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

core/src/main/java/org/neo4j/gds/core/loading/ArrayIdMap.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public class ArrayIdMap extends LabeledIdMap {
6161

6262
private final long highestNeoId;
6363

64-
private final HugeLongArray graphIds;
65-
private final HugeSparseLongArray nodeToGraphIds;
64+
private final HugeLongArray internalToOriginalIds;
65+
private final HugeSparseLongArray originalToInternalIds;
6666

6767
public static MemoryEstimation memoryEstimation() {
6868
return ESTIMATION;
@@ -72,26 +72,26 @@ public static MemoryEstimation memoryEstimation() {
7272
* initialize the map with pre-built sub arrays
7373
*/
7474
public ArrayIdMap(
75-
HugeLongArray graphIds,
76-
HugeSparseLongArray nodeToGraphIds,
75+
HugeLongArray internalToOriginalIds,
76+
HugeSparseLongArray originalToInternalIds,
7777
LabelInformation labelInformation,
7878
long nodeCount,
7979
long highestNeoId
8080
) {
8181
super(labelInformation, nodeCount);
82-
this.graphIds = graphIds;
83-
this.nodeToGraphIds = nodeToGraphIds;
82+
this.internalToOriginalIds = internalToOriginalIds;
83+
this.originalToInternalIds = originalToInternalIds;
8484
this.highestNeoId = highestNeoId;
8585
}
8686

8787
@Override
8888
public long toMappedNodeId(long originalNodeId) {
89-
return nodeToGraphIds.get(originalNodeId);
89+
return originalToInternalIds.get(originalNodeId);
9090
}
9191

9292
@Override
9393
public long toOriginalNodeId(long mappedNodeId) {
94-
return graphIds.get(mappedNodeId);
94+
return internalToOriginalIds.get(mappedNodeId);
9595
}
9696

9797
@Override
@@ -106,7 +106,7 @@ public IdMap rootIdMap() {
106106

107107
@Override
108108
public boolean contains(final long originalNodeId) {
109-
return nodeToGraphIds.contains(originalNodeId);
109+
return originalToInternalIds.contains(originalNodeId);
110110
}
111111

112112
@Override
@@ -141,7 +141,7 @@ public Optional<FilteredIdMap> withFilteredLabels(Collection<NodeLabel> nodeLabe
141141

142142
HugeSparseLongArray newNodeToGraphIds = ArrayIdMapBuilderOps.buildSparseIdMap(
143143
newNodeCount,
144-
nodeToGraphIds.capacity(),
144+
originalToInternalIds.capacity(),
145145
concurrency,
146146
newGraphIds
147147
);

core/src/main/java/org/neo4j/gds/core/loading/ArrayIdMapBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public IdMap build(
6969
) {
7070
adders.close();
7171
long nodeCount = this.size();
72-
var graphIds = this.array();
73-
return ArrayIdMapBuilderOps.build(graphIds, nodeCount, labelInformationBuilder, highestNodeId, concurrency);
72+
HugeLongArray internalToOriginalIds = this.array();
73+
return ArrayIdMapBuilderOps.build(internalToOriginalIds, nodeCount, labelInformationBuilder, highestNodeId, concurrency);
7474
}
7575

7676
public HugeLongArray array() {

core/src/main/java/org/neo4j/gds/core/loading/ArrayIdMapBuilderOps.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,28 @@
3131
public final class ArrayIdMapBuilderOps {
3232

3333
static ArrayIdMap build(
34-
HugeLongArray graphIds,
34+
HugeLongArray internalToOriginalIds,
3535
long nodeCount,
3636
LabelInformation.Builder labelInformationBuilder,
3737
long highestNodeId,
3838
int concurrency
3939
) {
4040
if (highestNodeId == NodesBuilder.UNKNOWN_MAX_ID) {
41-
highestNodeId = graphIds.asNodeProperties().getMaxLongPropertyValue().orElse(NodesBuilder.UNKNOWN_MAX_ID);
41+
highestNodeId = internalToOriginalIds.asNodeProperties().getMaxLongPropertyValue().orElse(NodesBuilder.UNKNOWN_MAX_ID);
4242
}
4343

44-
HugeSparseLongArray nodeToGraphIds = buildSparseIdMap(
44+
HugeSparseLongArray originalToInternalIds = buildSparseIdMap(
4545
nodeCount,
4646
highestNodeId,
4747
concurrency,
48-
graphIds
48+
internalToOriginalIds
4949
);
5050

51-
var labelInformation = labelInformationBuilder.build(nodeCount, nodeToGraphIds::get);
51+
var labelInformation = labelInformationBuilder.build(nodeCount, originalToInternalIds::get);
5252

5353
return new ArrayIdMap(
54-
graphIds,
55-
nodeToGraphIds,
54+
internalToOriginalIds,
55+
originalToInternalIds,
5656
labelInformation,
5757
nodeCount,
5858
highestNodeId

0 commit comments

Comments
 (0)