From 86e3f1fc3aff58e2ea648dde4ac4d8008e91ca67 Mon Sep 17 00:00:00 2001 From: Gary Rong Date: Fri, 28 Mar 2025 11:38:34 +0800 Subject: [PATCH] ethdb: add log --- ethdb/leveldb/leveldb.go | 13 ++++++++++--- ethdb/pebble/pebble.go | 11 +++++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ethdb/leveldb/leveldb.go b/ethdb/leveldb/leveldb.go index 5c4f659400..e04e7c5bea 100644 --- a/ethdb/leveldb/leveldb.go +++ b/ethdb/leveldb/leveldb.go @@ -23,11 +23,11 @@ package leveldb import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/crypto" "sync" "time" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" @@ -221,12 +221,19 @@ func (db *Database) DeleteRange(start, end []byte) error { defer it.Release() var ( - count int - buff = crypto.NewKeccakState() + count int + ignored int + buff = crypto.NewKeccakState() ) + defer func() { + if ignored > 0 { + log.Info("Skipped entries from deletion", "number", ignored) + } + }() for it.Next() && bytes.Compare(end, it.Key()) > 0 { // Prevent deletion for trie nodes in hash mode if h := crypto.HashData(buff, it.Value()); h == common.BytesToHash(it.Key()) { + ignored++ continue } count++ diff --git a/ethdb/pebble/pebble.go b/ethdb/pebble/pebble.go index c44758ce6e..423d0b3a52 100644 --- a/ethdb/pebble/pebble.go +++ b/ethdb/pebble/pebble.go @@ -359,12 +359,19 @@ func (d *Database) DeleteRange(start, end []byte) error { defer it.Release() var ( - count int - buff = crypto.NewKeccakState() + count int + ignored int + buff = crypto.NewKeccakState() ) + defer func() { + if ignored > 0 { + log.Info("Skipped entries from deletion", "number", ignored) + } + }() for it.Next() && bytes.Compare(end, it.Key()) > 0 { // Prevent deletion for trie nodes in hash mode if h := crypto.HashData(buff, it.Value()); h == common.BytesToHash(it.Key()) { + ignored++ continue } count++