Revert "Perf/skip commit queue (#7571)"

This reverts commit 8296752.
NethermindEth · Nov 6, 2024 · 0aafbd8 · 0aafbd8
1 parent 0f76573
commit 0aafbd8
Show file tree

Hide file tree

Showing 18 changed files with 515 additions and 499 deletions.
diff --git a/src/Nethermind/Nethermind.Core/PubSub/CompositePublisher.cs b/src/Nethermind/Nethermind.Core/PubSub/CompositePublisher.cs
@@ -16,7 +16,6 @@ public CompositePublisher(params IPublisher[] publishers)
 
         public async Task PublishAsync<T>(T data) where T : class
         {
-            // TODO: .Net 9 stackalloc
             Task[] tasks = new Task[_publishers.Length];
             for (int i = 0; i < _publishers.Length; i++)
             {

diff --git a/src/Nethermind/Nethermind.Network/CompositeNodeSource.cs b/src/Nethermind/Nethermind.Network/CompositeNodeSource.cs
@@ -20,8 +20,7 @@ public async IAsyncEnumerable<Node> DiscoverNodes([EnumeratorCancellation] Cance
     {
         Channel<Node> ch = Channel.CreateBounded<Node>(1);
 
-        // TODO: .Net 9 stackalloc
-        Task[] feedTasks = _nodeSources.Select(async innerSource =>
+        Task[] feedTasks = _nodeSources.Select(async (innerSource) =>
         {
             await foreach (Node node in innerSource.DiscoverNodes(cancellationToken))
             {

diff --git a/src/Nethermind/Nethermind.Synchronization.Test/SyncServerTests.cs b/src/Nethermind/Nethermind.Synchronization.Test/SyncServerTests.cs
@@ -702,11 +702,8 @@ public void GetNodeData_returns_cached_trie_nodes()
         Hash256 nodeKey = TestItem.KeccakA;
         TrieNode node = new(NodeType.Leaf, nodeKey, TestItem.KeccakB.Bytes);
         IScopedTrieStore scopedTrieStore = trieStore.GetTrieStore(null);
-        using (ICommitter committer = scopedTrieStore.BeginCommit(TrieType.State, 1, node))
-        {
-            TreePath path = TreePath.Empty;
-            committer.CommitNode(ref path, new NodeCommitInfo(node));
-        }
+        scopedTrieStore.CommitNode(1, new NodeCommitInfo(node, TreePath.Empty));
+        scopedTrieStore.FinishBlockCommit(TrieType.State, 1, node);
 
         stateDb.KeyExists(nodeKey).Should().BeFalse();
         ctx.SyncServer.GetNodeData(new[] { nodeKey }, CancellationToken.None, NodeDataType.All).Should().BeEquivalentTo(new[] { TestItem.KeccakB.BytesToArray() });

diff --git a/src/Nethermind/Nethermind.Trie.Test/Pruning/TreeStoreTests.cs b/src/Nethermind/Nethermind.Trie.Test/Pruning/TreeStoreTests.cs
diff --git a/src/Nethermind/Nethermind.Trie.Test/TrieNodeTests.cs b/src/Nethermind/Nethermind.Trie.Test/TrieNodeTests.cs
@@ -933,20 +933,15 @@ public void Rlp_is_cloned_when_cloning()
         TreePath emptyPath = TreePath.Empty;
         leaf1.ResolveKey(trieStore, ref emptyPath, false);
         leaf1.Seal();
+        trieStore.CommitNode(0, new NodeCommitInfo(leaf1, TreePath.Empty));
 
         TrieNode leaf2 = new(NodeType.Leaf);
         leaf2.Key = Bytes.FromHexString("abd");
         leaf2.Value = new byte[222];
         leaf2.ResolveKey(trieStore, ref emptyPath, false);
         leaf2.Seal();
-
-        TreePath path = TreePath.Empty;
-
-        using (ICommitter? committer = trieStore.BeginCommit(TrieType.State, 0, leaf2))
-        {
-            committer.CommitNode(ref path, new NodeCommitInfo(leaf1));
-            committer.CommitNode(ref path, new NodeCommitInfo(leaf2));
-        }
+        trieStore.CommitNode(0, new NodeCommitInfo(leaf2, TreePath.Empty));
+        trieStore.FinishBlockCommit(TrieType.State, 0, leaf2);
 
         TrieNode trieNode = new(NodeType.Branch);
         trieNode.SetChild(1, leaf1);

diff --git a/src/Nethermind/Nethermind.Trie/BatchedTrieVisitor.cs b/src/Nethermind/Nethermind.Trie/BatchedTrieVisitor.cs
@@ -142,12 +142,11 @@ public void Start(
 
         try
         {
-            // TODO: .Net 9 stackalloc
             Task[]? tasks = Enumerable.Range(0, trieVisitContext.MaxDegreeOfParallelism)
-                .Select(_ => Task.Run(BatchedThread))
+                .Select((_) => Task.Run(BatchedThread))
                 .ToArray();
 
-            Task.WaitAll(tasks);
+            Task.WhenAll(tasks).Wait();
         }
         catch (Exception)
         {

diff --git a/src/Nethermind/Nethermind.Trie/CachedTrieStore.cs b/src/Nethermind/Nethermind.Trie/CachedTrieStore.cs
@@ -19,25 +19,46 @@ public class CachedTrieStore(IScopedTrieStore @base) : IScopedTrieStore
 {
     private readonly NonBlocking.ConcurrentDictionary<(TreePath path, Hash256 hash), TrieNode> _cachedNode = new();
 
-    public TrieNode FindCachedOrUnknown(in TreePath path, Hash256 hash) =>
-        _cachedNode.GetOrAdd((path, hash), (key) => @base.FindCachedOrUnknown(key.path, key.hash));
+    public TrieNode FindCachedOrUnknown(in TreePath path, Hash256 hash)
+    {
+        return _cachedNode.GetOrAdd((path, hash), (key) => @base.FindCachedOrUnknown(key.path, key.hash));
+    }
 
-    public byte[]? LoadRlp(in TreePath path, Hash256 hash, ReadFlags flags = ReadFlags.None) =>
-        @base.LoadRlp(in path, hash, flags);
+    public byte[]? LoadRlp(in TreePath path, Hash256 hash, ReadFlags flags = ReadFlags.None)
+    {
+        return @base.LoadRlp(in path, hash, flags);
+    }
 
-    public byte[]? TryLoadRlp(in TreePath path, Hash256 hash, ReadFlags flags = ReadFlags.None) =>
-        @base.TryLoadRlp(in path, hash, flags);
+    public byte[]? TryLoadRlp(in TreePath path, Hash256 hash, ReadFlags flags = ReadFlags.None)
+    {
+        return @base.TryLoadRlp(in path, hash, flags);
+    }
 
-    public ITrieNodeResolver GetStorageTrieNodeResolver(Hash256? address) =>
+    public ITrieNodeResolver GetStorageTrieNodeResolver(Hash256? address)
+    {
         throw new InvalidOperationException("unsupported");
+    }
 
     public INodeStorage.KeyScheme Scheme => @base.Scheme;
 
-    public ICommitter BeginCommit(TrieType trieType, long blockNumber, TrieNode? root, WriteFlags writeFlags = WriteFlags.None) =>
-        @base.BeginCommit(trieType, blockNumber, root, writeFlags);
+    public void CommitNode(long blockNumber, NodeCommitInfo nodeCommitInfo, WriteFlags writeFlags = WriteFlags.None)
+    {
+        @base.CommitNode(blockNumber, nodeCommitInfo, writeFlags);
+    }
 
-    public bool IsPersisted(in TreePath path, in ValueHash256 keccak) => @base.IsPersisted(in path, in keccak);
+    public void FinishBlockCommit(TrieType trieType, long blockNumber, TrieNode? root, WriteFlags writeFlags = WriteFlags.None)
+    {
+        @base.FinishBlockCommit(trieType, blockNumber, root, writeFlags);
+    }
 
-    public void Set(in TreePath path, in ValueHash256 keccak, byte[] rlp) => @base.Set(in path, in keccak, rlp);
+    public bool IsPersisted(in TreePath path, in ValueHash256 keccak)
+    {
+        return @base.IsPersisted(in path, in keccak);
+    }
+
+    public void Set(in TreePath path, in ValueHash256 keccak, byte[] rlp)
+    {
+        @base.Set(in path, in keccak, rlp);
+    }
 }
 
diff --git a/src/Nethermind/Nethermind.Trie/NodeCommitInfo.cs b/src/Nethermind/Nethermind.Trie/NodeCommitInfo.cs
@@ -1,35 +1,37 @@
-using System.Diagnostics.CodeAnalysis;
-
 namespace Nethermind.Trie
 {
     public readonly struct NodeCommitInfo
     {
         public NodeCommitInfo(
-            TrieNode node
+            TrieNode node,
+            in TreePath path
         )
         {
             ChildPositionAtParent = 0;
             Node = node;
+            Path = path;
             NodeParent = null;
         }
 
         public NodeCommitInfo(
             TrieNode node,
             TrieNode nodeParent,
+            in TreePath path,
             int childPositionAtParent)
         {
             ChildPositionAtParent = childPositionAtParent;
             Node = node;
+            Path = path;
             NodeParent = nodeParent;
         }
 
         public TrieNode? Node { get; }
+        public readonly TreePath Path;
 
         public TrieNode? NodeParent { get; }
 
         public int ChildPositionAtParent { get; }
 
-        [MemberNotNullWhen(false, nameof(Node))]
         public bool IsEmptyBlockMarker => Node is null;
 
         public bool IsRoot => !IsEmptyBlockMarker && NodeParent is null;