e3: split "changed keys" iterator to simplify (erigontech#7086)

calmbeing · Mar 16, 2023 · 2e0be95 · 2e0be95
1 parent 1ad9292
commit 2e0be95
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/cmd/rpcdaemon/commands/debug_api.go b/cmd/rpcdaemon/commands/debug_api.go
@@ -205,8 +205,12 @@ func (api *PrivateDebugAPIImpl) GetModifiedAccountsByNumber(ctx context.Context,
 // getModifiedAccountsV3 returns a list of addresses that were modified in the block range
 // [startNum:endNum)
 func getModifiedAccountsV3(tx kv.TemporalTx, startTxNum, endTxNum uint64) ([]common.Address, error) {
+	it, err := tx.HistoryRange(temporal.AccountsHistory, int(startTxNum), int(endTxNum), order.Asc, -1)
+	if err != nil {
+		return nil, err
+	}
+
 	changedAddrs := make(map[common.Address]struct{})
-	it, _ := tx.HistoryRange(temporal.AccountsHistory, int(startTxNum), int(endTxNum), order.Asc, -1)
 	for it.HasNext() {
 		k, _, err := it.Next()
 		if err != nil {

diff --git a/core/state/temporal/kv_temporal.go b/core/state/temporal/kv_temporal.go
@@ -343,15 +343,19 @@ func (tx *Tx) HistoryRange(name kv.History, fromTs, toTs int, asc order.By, limi
 	}
 	switch name {
 	case AccountsHistory:
-		it = tx.agg.AccountHistoryIterateChanged(fromTs, toTs, asc, limit, tx)
-		return it, nil
+		it, err = tx.agg.AccountHistoryIterateChanged(fromTs, toTs, asc, limit, tx)
 	case StorageHistory:
-		it = tx.agg.StorageHistoryIterateChanged(fromTs, toTs, asc, limit, tx)
-		return it, nil
+		it, err = tx.agg.StorageHistoryIterateChanged(fromTs, toTs, asc, limit, tx)
 	case CodeHistory:
-		it = tx.agg.CodeHistoryIterateChanged(fromTs, toTs, asc, limit, tx)
-		return it, nil
+		it, err = tx.agg.CodeHistoryIterateChanged(fromTs, toTs, asc, limit, tx)
 	default:
 		return nil, fmt.Errorf("unexpected history name: %s", name)
 	}
+	if err != nil {
+		return nil, err
+	}
+	if closer, ok := it.(kv.Closer); ok {
+		tx.resourcesToClose = append(tx.resourcesToClose, closer)
+	}
+	return it, err
 }
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon
 go 1.18
 
 require (
-	github.com/ledgerwatch/erigon-lib v0.0.0-20230313023514-6f17999b1f89
+	github.com/ledgerwatch/erigon-lib v0.0.0-20230313075942-ae07c2744483
 	github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230306083105-1391330d62a3
 	github.com/ledgerwatch/log/v3 v3.7.0
 	github.com/ledgerwatch/secp256k1 v1.0.0