Separate blocks and transactions

NethermindEth · Jun 4, 2024 · b2062d1 · b2062d1
1 parent 50566e2
commit b2062d1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 16 deletions.
diff --git a/src/Nethermind/Nethermind.Db.Rocks/Config/PerTableDbConfig.cs b/src/Nethermind/Nethermind.Db.Rocks/Config/PerTableDbConfig.cs
@@ -112,10 +112,14 @@ private string[] GetPrefixes()
                     if (propertyInfo.PropertyType.CanBeAssignedNull())
                     {
                         // If its nullable check if its null first
-                        T? val = (T?)propertyInfo.GetValue(dbConfig);
-                        if (val is not null)
+                        object? valObj = propertyInfo.GetValue(dbConfig);
+                        if (valObj is not null)
                         {
-                            return val;
+                            T? val = (T?)valObj;
+                            if (val is not null)
+                            {
+                                return val;
+                            }
                         }
                     }
                     else
@@ -132,7 +136,7 @@ private string[] GetPrefixes()
         }
         catch (Exception e)
         {
-            throw new InvalidDataException($"Unable to read property from DB config. Prefixes: ${prefixes}", e);
+            throw new InvalidDataException($"Unable to read property {propertyName} from DB config. Prefixes: {string.Join(",", prefixes)}", e);
         }
     }
 }
diff --git a/src/Nethermind/Nethermind.Synchronization.Test/DbTuner/SyncDbTunerTests.cs b/src/Nethermind/Nethermind.Synchronization.Test/DbTuner/SyncDbTunerTests.cs
@@ -24,7 +24,8 @@ public class SyncDbTunerTests
     private ITunableDb _stateDb = null!;
     private ITunableDb _codeDb = null!;
     private ITunableDb _blockDb = null!;
-    private ITunableDb _receiptDb = null!;
+    private ITunableDb _receiptBlocksDb = null!;
+    private ITunableDb _receiptTransactionsDb = null!;
 
     [SetUp]
     public void Setup()
@@ -42,7 +43,8 @@ public void Setup()
         _stateDb = Substitute.For<ITunableDb>();
         _codeDb = Substitute.For<ITunableDb>();
         _blockDb = Substitute.For<ITunableDb>();
-        _receiptDb = Substitute.For<ITunableDb>();
+        _receiptBlocksDb = Substitute.For<ITunableDb>();
+        _receiptTransactionsDb = Substitute.For<ITunableDb>();
 
         SyncDbTuner _ = new SyncDbTuner(
             _syncConfig,
@@ -52,15 +54,17 @@ public void Setup()
             _stateDb,
             _codeDb,
             _blockDb,
-            _receiptDb);
+            _receiptBlocksDb,
+            _receiptTransactionsDb);
     }
 
     [TearDown]
     public void TearDown()
     {
         _blockDb?.Dispose();
         _codeDb?.Dispose();
-        _receiptDb?.Dispose();
+        _receiptBlocksDb?.Dispose();
+        _receiptTransactionsDb?.Dispose();
         _stateDb?.Dispose();
     }
 
@@ -83,9 +87,15 @@ public void WhenBodiesIsOn_TriggerBlocksDbTune()
     }
 
     [Test]
-    public void WhenReceiptsIsOn_TriggerReceiptsDbTune()
+    public void WhenReceiptsIsOn_TriggerReceiptBlocksDbTune()
     {
-        TestFeedAndDbTune(_receiptSyncFeed, _receiptDb, _receiptsTuneType);
+        TestFeedAndDbTune(_receiptSyncFeed, _receiptBlocksDb, _receiptsTuneType);
+    }
+
+    [Test]
+    public void WhenReceiptsIsOn_TriggerReceiptsTransactionsDbTune()
+    {
+        TestFeedAndDbTune(_receiptSyncFeed, _receiptTransactionsDb, _tuneType);
     }
 
     private void TestFeedAndDbTune<T>(ISyncFeed<T> feed, ITunableDb db, ITunableDb.TuneType? tuneType = null)

diff --git a/src/Nethermind/Nethermind.Synchronization/DbTuner/SyncDbOptimizer.cs b/src/Nethermind/Nethermind.Synchronization/DbTuner/SyncDbOptimizer.cs
@@ -14,7 +14,8 @@ public class SyncDbTuner
     private readonly ITunableDb? _stateDb;
     private readonly ITunableDb? _codeDb;
     private readonly ITunableDb? _blockDb;
-    private readonly ITunableDb? _receiptDb;
+    private readonly ITunableDb? _receiptBlocksDb;
+    private readonly ITunableDb? _receiptTransactionsDb;
 
     private readonly ITunableDb.TuneType _tuneType;
     private readonly ITunableDb.TuneType _blocksDbTuneType;
@@ -28,7 +29,8 @@ public SyncDbTuner(
         ITunableDb? stateDb,
         ITunableDb? codeDb,
         ITunableDb? blockDb,
-        ITunableDb? receiptDb
+        ITunableDb? receiptBlocksDb,
+        ITunableDb? receiptTransactionsDb
     )
     {
         // Only these three make sense as they are write heavy
@@ -52,7 +54,8 @@ public SyncDbTuner(
         _stateDb = stateDb;
         _codeDb = codeDb;
         _blockDb = blockDb;
-        _receiptDb = receiptDb;
+        _receiptBlocksDb = receiptBlocksDb;
+        _receiptTransactionsDb = receiptTransactionsDb;
 
         _tuneType = syncConfig.TuneDbMode;
         _blocksDbTuneType = syncConfig.BlocksDbTuneDbMode;
@@ -89,11 +92,13 @@ private void ReceiptsStateChanged(object? sender, SyncFeedStateEventArgs e)
     {
         if (e.NewState == SyncFeedState.Active)
         {
-            _receiptDb?.Tune(_receiptsDbTuneType);
+            _receiptBlocksDb?.Tune(_receiptsDbTuneType);
+            _receiptTransactionsDb?.Tune(_tuneType);
         }
         else if (e.NewState == SyncFeedState.Finished)
         {
-            _receiptDb?.Tune(ITunableDb.TuneType.Default);
+            _receiptBlocksDb?.Tune(ITunableDb.TuneType.Default);
+            _receiptTransactionsDb?.Tune(ITunableDb.TuneType.Default);
         }
     }
 }
diff --git a/src/Nethermind/Nethermind.Synchronization/Synchronizer.cs b/src/Nethermind/Nethermind.Synchronization/Synchronizer.cs
@@ -222,7 +222,8 @@ private void SetupDbOptimizer()
                 _dbProvider.StateDb as ITunableDb,
                 _dbProvider.CodeDb as ITunableDb,
                 _dbProvider.BlocksDb as ITunableDb,
-                _dbProvider.ReceiptsDb as ITunableDb);
+                _dbProvider.ReceiptsDb.GetColumnDb(ReceiptsColumns.Blocks) as ITunableDb,
+                _dbProvider.ReceiptsDb.GetColumnDb(ReceiptsColumns.Transactions) as ITunableDb);
         }
 
         private void StartFullSyncComponents()