From 32772ca5dc42437587970685d613928bc3c43b91 Mon Sep 17 00:00:00 2001
From: Alexey Shekhirin <a.shekhirin@gmail.com>
Date: Tue, 30 May 2023 12:52:07 +0400
Subject: [PATCH] perf(storage): use `delete_current` when possible (#2909)

---
 crates/stages/src/stages/bodies.rs         | 2 +-
 crates/stages/src/stages/execution.rs      | 4 ++--
 crates/storage/provider/src/transaction.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/stages/src/stages/bodies.rs b/crates/stages/src/stages/bodies.rs
index 1ad3cb1e8f..04a14fdaf1 100644
--- a/crates/stages/src/stages/bodies.rs
+++ b/crates/stages/src/stages/bodies.rs
@@ -203,7 +203,7 @@ impl<DB: Database, D: BodyDownloader> Stage<DB> for BodyStage<D> {
             }
 
             // Delete the current body value
-            tx.delete::<tables::BlockBodyIndices>(number, None)?;
+            rev_walker.delete_current()?;
         }
 
         info!(target: "sync::stages::bodies", to_block = input.unwind_to, stage_progress = input.unwind_to, is_final_range = true, "Unwind iteration finished");
diff --git a/crates/stages/src/stages/execution.rs b/crates/stages/src/stages/execution.rs
index aabeed188f..f9e21644de 100644
--- a/crates/stages/src/stages/execution.rs
+++ b/crates/stages/src/stages/execution.rs
@@ -292,7 +292,7 @@ impl<EF: ExecutorFactory, DB: Database> Stage<DB> for ExecutionStage<EF> {
                 break
             }
             // delete all changesets
-            tx.delete::<tables::AccountChangeSet>(block_num, None)?;
+            rev_acc_changeset_walker.delete_current()?;
         }
 
         let mut rev_storage_changeset_walker = storage_changeset.walk_back(None)?;
@@ -301,7 +301,7 @@ impl<EF: ExecutorFactory, DB: Database> Stage<DB> for ExecutionStage<EF> {
                 break
             }
             // delete all changesets
-            tx.delete::<tables::StorageChangeSet>(key, None)?;
+            rev_storage_changeset_walker.delete_current()?;
         }
 
         // Look up the start index for the transaction range
diff --git a/crates/storage/provider/src/transaction.rs b/crates/storage/provider/src/transaction.rs
index 7140c7e778..0b8dfbf1f2 100644
--- a/crates/storage/provider/src/transaction.rs
+++ b/crates/storage/provider/src/transaction.rs
@@ -212,7 +212,7 @@ where
             if selector(entry_key.clone()) <= key {
                 break
             }
-            self.delete::<T>(entry_key, None)?;
+            reverse_walker.delete_current()?;
             deleted += 1;
         }