Fix graph-chunk node population

Author: Kneelawk

modules/core-xplat/src/main/java/com/kneelawk/graphlib/impl/graph/simple/SimpleBlockGraphChunk.java

@@ -82,6 +82,7 @@ private record SerialNode(long id, BlockNode node) {
     private final Short2ObjectMap<LongSet> graphsInPos = new Short2ObjectLinkedOpenHashMap<>();
     private final LongSet graphsInChunk = new LongLinkedOpenHashSet();
     private final Short2ObjectMap<Object2LongMap<BlockNode>> blockNodes = new Short2ObjectLinkedOpenHashMap<>();
+    private boolean blockNodesPopulated;
 
     private SimpleBlockGraphChunk(@NotNull SimpleServerGraphWorld world, @NotNull SectionPos chunkPos,
                                   @NotNull Runnable markDirty, @NotNull Serial serial) {
@@ -93,7 +94,6 @@ private SimpleBlockGraphChunk(@NotNull SimpleServerGraphWorld world, @NotNull Se
         for (SerialInPos serialInPos : serial.inPos()) {
             BlockPos pos = serialInPos.pos();
             short shortPos = SectionPos.sectionRelativePos(pos);
-            BlockPos keyPos = pos.offset(chunkPos.minBlockX(), chunkPos.minBlockY(), chunkPos.minBlockZ());
 
             LongSet inPos = graphsInPos.computeIfAbsent(shortPos, pos1 -> new LongLinkedOpenHashSet());
             Object2LongMap<BlockNode> nodes =
@@ -105,24 +105,14 @@ private SimpleBlockGraphChunk(@NotNull SimpleServerGraphWorld world, @NotNull Se
                     inPos.add(serialNode.id());
                     nodes.put(serialNode.node(), serialNode.id());
                 }
+                blockNodesPopulated = true;
             });
 
             // Legacy route
             serialInPos.either().ifRight(longs -> {
                 inPos.addAll(longs);
 
-                // build missing node->graphId map
-                for (LongIterator it = longs.iterator(); it.hasNext(); ) {
-                    long graphId = it.nextLong();
-
-                    SimpleBlockGraph graph = world.getGraph(graphId);
-                    if (graph != null) {
-                        for (var iter = graph.getNodesAt(keyPos).iterator(); iter.hasNext(); ) {
-                            var holder = iter.next();
-                            nodes.put(holder.getNode(), graphId);
-                        }
-                    }
-                }
+                blockNodesPopulated = false;
             });
         }
     }
@@ -135,18 +125,29 @@ public SimpleBlockGraphChunk(@NotNull SectionPos chunkPos, @NotNull Runnable mar
     private @NotNull Serial toSerial() {
         List<SerialInPos> inPosList = new ObjectArrayList<>();
 
-        for (ShortIterator keyIter = blockNodes.keySet().iterator(); keyIter.hasNext(); ) {
-            short shortPos = keyIter.nextShort();
-            BlockPos localPos =
-                new BlockPos(SectionPos.sectionRelativeX(shortPos), SectionPos.sectionRelativeY(shortPos),
-                    SectionPos.sectionRelativeZ(shortPos));
+        if (blockNodesPopulated) {
+            for (ShortIterator keyIter = blockNodes.keySet().iterator(); keyIter.hasNext(); ) {
+                short shortPos = keyIter.nextShort();
+                BlockPos localPos =
+                    new BlockPos(SectionPos.sectionRelativeX(shortPos), SectionPos.sectionRelativeY(shortPos),
+                        SectionPos.sectionRelativeZ(shortPos));
 
-            List<SerialNode> serialNodes = new ObjectArrayList<>();
-            for (Object2LongMap.Entry<BlockNode> nodeEntry : blockNodes.get(shortPos).object2LongEntrySet()) {
-                serialNodes.add(new SerialNode(nodeEntry.getLongValue(), nodeEntry.getKey()));
-            }
+                List<SerialNode> serialNodes = new ObjectArrayList<>();
+                for (Object2LongMap.Entry<BlockNode> nodeEntry : blockNodes.get(shortPos).object2LongEntrySet()) {
+                    serialNodes.add(new SerialNode(nodeEntry.getLongValue(), nodeEntry.getKey()));
+                }
 
-            inPosList.add(new SerialInPos(localPos, Either.left(serialNodes)));
+                inPosList.add(new SerialInPos(localPos, Either.left(serialNodes)));
+            }
+        } else {
+            for (ShortIterator keyIter = graphsInPos.keySet().iterator(); keyIter.hasNext(); ) {
+                short shortPos = keyIter.nextShort();
+                BlockPos localPos =
+                    new BlockPos(SectionPos.sectionRelativeX(shortPos), SectionPos.sectionRelativeY(shortPos),
+                        SectionPos.sectionRelativeZ(shortPos));
+
+                inPosList.add(new SerialInPos(localPos, Either.right(graphsInPos.get(shortPos))));
+            }
         }
 
         return new Serial(graphsInChunk, inPosList);
@@ -158,6 +159,33 @@ public void clear() {
         blockNodes.clear();
     }
 
+    public void ensureBlockNodesPopulated(@NotNull Long2ObjectFunction<SimpleBlockGraph> graphGetter) {
+        if (blockNodesPopulated) return;
+
+        // build missing node->graphId map
+        for (LongIterator it = graphsInChunk.iterator(); it.hasNext(); ) {
+            long graphId = it.nextLong();
+
+            SimpleBlockGraph graph = graphGetter.get(graphId);
+            if (graph != null) {
+                for (var iter = graph.getNodes().iterator(); iter.hasNext(); ) {
+                    var holder = iter.next();
+
+                    BlockPos keyPos = holder.getBlockPos();
+                    if (chunkPos.minBlockX() <= keyPos.getX() && keyPos.getX() <= chunkPos.maxBlockX() &&
+                        chunkPos.minBlockY() <= keyPos.getY() && keyPos.getY() <= chunkPos.maxBlockY() &&
+                        chunkPos.minBlockZ() <= keyPos.getZ() && keyPos.getZ() <= chunkPos.maxBlockZ()) {
+
+                        blockNodes.computeIfAbsent(SectionPos.sectionRelativePos(keyPos),
+                            pos1 -> new Object2LongLinkedOpenHashMap<>()).put(holder.getNode(), graphId);
+                    }
+                }
+            }
+        }
+
+        blockNodesPopulated = true;
+    }
+
     public void putGraphWithNode(long id, @NotNull NodePos key) {
         markDirty.run();
 
@@ -198,14 +226,16 @@ public void removeGraph(long id) {
     }
 
     public @Nullable SimpleBlockGraph getGraphForNode(NodePos key, Long2ObjectFunction<SimpleBlockGraph> graphGetter) {
+        ensureBlockNodesPopulated(graphGetter);
         Object2LongMap<BlockNode> uNodes = blockNodes.get(SectionPos.sectionRelativePos(key.pos()));
         if (uNodes == null) return null;
         if (!uNodes.containsKey(key.node())) return null;
 
         return graphGetter.get(uNodes.getLong(key.node()));
     }
 
-    public boolean containsNode(NodePos key) {
+    public boolean containsNode(NodePos key, Long2ObjectFunction<SimpleBlockGraph> graphGetter) {
+        ensureBlockNodesPopulated(graphGetter);
         Object2LongMap<BlockNode> uNodes = blockNodes.get(SectionPos.sectionRelativePos(key.pos()));
         if (uNodes == null) return false;
         return uNodes.containsKey(key.node());

modules/core-xplat/src/main/java/com/kneelawk/graphlib/impl/graph/simple/SimpleServerGraphWorld.java

@@ -308,7 +308,7 @@ public void close() throws Exception {
     public boolean nodeExistsAt(@NotNull NodePos pos) {
         SimpleBlockGraphChunk chunk = chunks.getIfExists(SectionPos.of(pos.pos()));
         if (chunk != null) {
-            return chunk.containsNode(pos);
+            return chunk.containsNode(pos, this::getGraph);
         }
         return false;
     }

modules/syncing-core-xplat/src/main/java/com/kneelawk/graphlib/syncing/impl/graph/simple/SimpleClientGraphWorld.java

@@ -143,7 +143,7 @@ public boolean nodeExistsAt(@NotNull NodePos pos) {
         SimpleBlockGraphChunk chunk = manager.getIfExists(SectionPos.of(pos.pos()));
         if (chunk == null) return false;
 
-        return chunk.containsNode(pos);
+        return chunk.containsNode(pos, graphs);
     }
 
     @Override