Compact dbs manually (#6595)

NethermindEth · Jan 30, 2024 · d0ed28b · d0ed28b
1 parent 18999fb
commit d0ed28b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Nethermind/Nethermind.Db.Rocks/ColumnsDb.cs b/src/Nethermind/Nethermind.Db.Rocks/ColumnsDb.cs
@@ -28,6 +28,14 @@ public ColumnsDb(string basePath, DbSettings settings, IDbConfig dbConfig, ILogM
         }
     }
 
+    public override void Compact()
+    {
+        foreach (T key in ColumnKeys)
+        {
+            _columnDbs[key].Compact();
+        }
+    }
+
     private static IReadOnlyList<T> GetEnumKeys(IReadOnlyList<T> keys)
     {
         if (typeof(T).IsEnum && keys.Count == 0)

diff --git a/src/Nethermind/Nethermind.Db.Rocks/DbOnTheRocks.cs b/src/Nethermind/Nethermind.Db.Rocks/DbOnTheRocks.cs
@@ -962,7 +962,7 @@ public void Flush()
         InnerFlush();
     }
 
-    public void Compact()
+    public virtual void Compact()
     {
         _db.CompactRange(Keccak.Zero.BytesToArray(), Keccak.MaxValue.BytesToArray());
     }

diff --git a/src/Nethermind/Nethermind.Merge.Plugin/ProcessedTransactionsDbCleaner.cs b/src/Nethermind/Nethermind.Merge.Plugin/ProcessedTransactionsDbCleaner.cs
@@ -30,7 +30,7 @@ public ProcessedTransactionsDbCleaner(IBlockFinalizationManager finalizationMana
 
     private void OnBlocksFinalized(object? sender, FinalizeEventArgs e)
     {
-        if (e.FinalizedBlocks.Count > 0 && e.FinalizedBlocks[0].Number > _lastFinalizedBlock)
+        if (e.FinalizedBlocks.Count > 0 && e.FinalizedBlocks[0].Number > _lastFinalizedBlock && CleaningTask.IsCompleted)
         {
             CleaningTask = Task.Run(() => CleanProcessedTransactionsDb(e.FinalizedBlocks[0].Number));
         }
@@ -55,6 +55,10 @@ private void CleanProcessedTransactionsDb(long newlyFinalizedBlockNumber)
 
             if (_logger.IsDebug) _logger.Debug($"Cleaned processed blob txs from block {_lastFinalizedBlock} to block {newlyFinalizedBlockNumber}");
 
+            _processedTxsDb.Compact();
+
+            if (_logger.IsDebug) _logger.Debug($"Blob transactions database columns have been compacted");
+
             _lastFinalizedBlock = newlyFinalizedBlockNumber;
         }
         catch (Exception exception)