core/state/snapshot, ethdb/rocksdb: Fixed RocksDB Iterator error.

cp-wjhan · May 28, 2024 · 0a08255 · 0a08255
1 parent 79ed58b
commit 0a08255
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/state/snapshot/generate.go b/core/state/snapshot/generate.go
@@ -615,8 +615,7 @@ func generateAccounts(ctx *generatorContext, dl *diskLayer, accMarker []byte) er
 		// If the iterated account is the contract, create a further loop to
 		// verify or regenerate the contract storage.
 		if acc.Root == emptyRoot {
-			log.Debug("removeStorageAt skip for rocksdb")
-			// ctx.removeStorageAt(account)
+			ctx.removeStorageAt(account)
 		} else {
 			var storeMarker []byte
 			if accMarker != nil && bytes.Equal(account[:], accMarker) && len(dl.genMarker) > common.HashLength {

diff --git a/ethdb/rocksdb/rocksdb.go b/ethdb/rocksdb/rocksdb.go
@@ -272,6 +272,11 @@ func (it *RDBIterator) Next() bool {
 	if it.first {
 		it.first = false
 	} else {
+		// Added conditions to prevent Rocksdb Iterator error.
+		// Valid() call is a RocksDB requirement.
+		if C.rocksdb_iter_valid(it.it) == 0 {
+			return false
+		}
 		C.rocksdb_iter_next(it.it)
 	}
 	return C.rocksdb_iter_valid(it.it) != 0