Pass edited nodes to snap._applyNodeEdits (#3520)

Cisphyx · web-flow · commit 58efa7b9739a · 2024-01-31T17:12:33.000-05:00
diff --git a/synapse/lib/node.py b/synapse/lib/node.py
@@ -331,8 +331,7 @@ async def pop(self, name, init=False):
         if not edits:
             return False
 
-        await self.snap.applyNodeEdit((self.buid, self.form.name, edits))
-        self.props.pop(name, None)
+        await self.snap.applyNodeEdit((self.buid, self.form.name, edits), nodecache={self.buid: self})
         return True
 
     def repr(self, name=None, defv=None):
@@ -524,7 +523,7 @@ async def delTag(self, tag, init=False):
         edits = await self._getTagDelEdits(tag, init=init)
         if edits:
             nodeedit = (self.buid, self.form.name, edits)
-            await self.snap.applyNodeEdit(nodeedit)
+            await self.snap.applyNodeEdit(nodeedit, nodecache={self.buid: self})
 
     def _getTagPropDel(self, tag):
 
@@ -585,7 +584,7 @@ async def delTagProp(self, tag, name):
             (s_layer.EDIT_TAGPROP_DEL, (tag, name, None, prop.type.stortype), ()),
         )
 
-        await self.snap.applyNodeEdit((self.buid, self.form.name, edits))
+        await self.snap.applyNodeEdit((self.buid, self.form.name, edits), nodecache={self.buid: self})
 
     async def delete(self, force=False):
         '''
diff --git a/synapse/lib/snap.py b/synapse/lib/snap.py
@@ -1085,7 +1085,8 @@ async def getNodeEditor(self, node):
 
         nodeedits = editor.getNodeEdits()
         if nodeedits:
-            await self.applyNodeEdits(nodeedits)
+            nodecache = {proto.buid: proto.node for proto in editor.protonodes.values()}
+            await self.applyNodeEdits(nodeedits, nodecache=nodecache)
 
     @contextlib.asynccontextmanager
     async def getEditor(self):
@@ -1096,18 +1097,20 @@ async def getEditor(self):
 
         nodeedits = editor.getNodeEdits()
         if nodeedits:
-            await self.applyNodeEdits(nodeedits)
+            nodecache = {proto.buid: proto.node for proto in editor.protonodes.values()}
+            await self.applyNodeEdits(nodeedits, nodecache=nodecache)
 
-    async def applyNodeEdit(self, edit):
-        nodes = await self.applyNodeEdits((edit,))
-        return nodes[0]
+    async def applyNodeEdit(self, edit, nodecache=None):
+        nodes = await self.applyNodeEdits((edit,), nodecache=nodecache)
+        if nodes:
+            return nodes[0]
 
-    async def applyNodeEdits(self, edits):
+    async def applyNodeEdits(self, edits, nodecache=None):
         '''
         Sends edits to the write layer and evaluates the consequences (triggers, node object updates)
         '''
         meta = await self.getSnapMeta()
-        saveoff, changes, nodes = await self._applyNodeEdits(edits, meta)
+        saveoff, changes, nodes = await self._applyNodeEdits(edits, meta, nodecache=nodecache)
         return nodes
 
     async def saveNodeEdits(self, edits, meta):
@@ -1124,7 +1127,7 @@ async def saveNodeEdits(self, edits, meta):
 
         return saveoff, changes
 
-    async def _applyNodeEdits(self, edits, meta):
+    async def _applyNodeEdits(self, edits, meta, nodecache=None):
 
         if self.readonly:
             mesg = 'The snapshot is in read-only mode.'
@@ -1145,11 +1148,17 @@ async def _applyNodeEdits(self, edits, meta):
 
             cache = {wlyr.iden: sode}
 
-            node = await self._joinStorNode(buid, cache)
+            node = None
+            if nodecache is not None:
+                node = nodecache.get(buid)
 
             if node is None:
-                # We got part of a node but no ndef
-                continue
+                node = await self._joinStorNode(buid, cache)
+                if node is None:
+                    # We got part of a node but no ndef
+                    continue
+            else:
+                await asyncio.sleep(0)
 
             nodes.append(node)
 
diff --git a/synapse/tests/test_lib_snap.py b/synapse/tests/test_lib_snap.py
@@ -276,6 +276,16 @@ async def test_cortex_lift_layers_simple(self):
             self.len(1, await alist(view1.eval('inet:ipv4 +:asn=42')))
             self.len(1, await alist(view1.eval('inet:ipv4 +#woot')))
 
+            await view0.core.nodes('[ inet:ipv4=1.1.1.1 :asn=5 ]')
+            nodes = await view0.core.nodes('inet:ipv4=1.1.1.1 [ :asn=6 ]', opts={'view': view1.iden})
+
+            await view0.core.nodes('inet:ipv4=1.1.1.1 | delnode')
+            edits = await nodes[0]._getPropDelEdits('asn')
+
+            root = view0.core.auth.rootuser
+            async with await view1.snap(user=root) as snap:
+                await snap.applyNodeEdit((nodes[0].buid, 'inet:ipv4', edits))
+
     async def test_cortex_lift_layers_bad_filter(self):
         '''
         Test a two layer cortex where a lift operation gives the wrong result
diff --git a/synapse/tests/test_lib_storm.py b/synapse/tests/test_lib_storm.py
@@ -1936,6 +1936,32 @@ async def test_storm_dmon_user_autobump(self):
                     await core.setUserLocked(visi.iden, False)
                     self.true(await stream.wait(2))
 
+    async def test_storm_dmon_caching(self):
+
+        async with self.getTestCore() as core:
+
+            q = f'''
+            $lib.dmon.add(${{
+                for $x in $lib.range(2) {{
+                    inet:ipv4=1.2.3.4
+                    if $node {{
+                        $lib.queue.gen(foo).put($node.props.asn)
+                        $lib.queue.gen(bar).get(1)
+                    }}
+                    [ inet:ipv4=1.2.3.4 :asn=5 ]
+                    $lib.queue.gen(foo).put($node.props.asn)
+                    $lib.queue.gen(bar).get(0)
+                }}
+                | spin
+            }}, name=foo)'''
+            await core.nodes(q)
+
+            self.eq((0, 5), await core.callStorm('return($lib.queue.gen(foo).get(0))'))
+
+            await core.nodes('inet:ipv4=1.2.3.4 [ :asn=6 ] $lib.queue.gen(bar).put(0)')
+
+            self.eq((1, 6), await core.callStorm('return($lib.queue.gen(foo).get(1))'))
+
     async def test_storm_pipe(self):
 
         async with self.getTestCore() as core:
