Remove unused history config: withLocalityIndex (#13109)

erigontech · Dec 16, 2024 · ac20eac · ac20eac
1 parent a216fd5
commit ac20eac
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/erigon-lib/state/aggregator.go b/erigon-lib/state/aggregator.go
@@ -164,7 +164,7 @@ func NewAggregator(ctx context.Context, dirs datadir.Dirs, aggregationStep uint6
 			valuesTable: kv.TblAccountHistoryVals,
 			compression: seg.CompressNone,
 
-			withLocalityIndex: false, historyLargeValues: false,
+			historyLargeValues: false,
 
 			iiCfg: iiCfg{salt: salt, dirs: dirs, db: db, withExistence: false, compressorCfg: seg.DefaultCfg,
 				aggregationStep: aggregationStep, keysTable: kv.TblAccountHistoryKeys, valuesTable: kv.TblAccountIdx},
@@ -184,7 +184,7 @@ func NewAggregator(ctx context.Context, dirs datadir.Dirs, aggregationStep uint6
 			valuesTable: kv.TblStorageHistoryVals,
 			compression: seg.CompressNone,
 
-			withLocalityIndex: false, historyLargeValues: false,
+			historyLargeValues: false,
 
 			iiCfg: iiCfg{salt: salt, dirs: dirs, db: db, withExistence: false, compressorCfg: seg.DefaultCfg,
 				aggregationStep: aggregationStep, keysTable: kv.TblStorageHistoryKeys, valuesTable: kv.TblStorageIdx},
@@ -205,7 +205,7 @@ func NewAggregator(ctx context.Context, dirs datadir.Dirs, aggregationStep uint6
 			valuesTable: kv.TblCodeHistoryVals,
 			compression: seg.CompressKeys | seg.CompressVals,
 
-			withLocalityIndex: false, historyLargeValues: true,
+			historyLargeValues: true,
 
 			iiCfg: iiCfg{salt: salt, dirs: dirs, db: db, withExistence: false, compressorCfg: seg.DefaultCfg,
 				aggregationStep: aggregationStep, keysTable: kv.TblCodeHistoryKeys, valuesTable: kv.TblCodeIdx},
@@ -226,8 +226,8 @@ func NewAggregator(ctx context.Context, dirs datadir.Dirs, aggregationStep uint6
 			valuesTable: kv.TblCommitmentHistoryVals,
 			compression: seg.CompressNone,
 
-			snapshotsDisabled: true,
-			withLocalityIndex: false, historyLargeValues: false,
+			snapshotsDisabled:  true,
+			historyLargeValues: false,
 
 			iiCfg: iiCfg{salt: salt, dirs: dirs, db: db, withExistence: false, compressorCfg: seg.DefaultCfg,
 				aggregationStep: aggregationStep, keysTable: kv.TblCommitmentHistoryKeys, valuesTable: kv.TblCommitmentIdx},
@@ -245,7 +245,7 @@ func NewAggregator(ctx context.Context, dirs datadir.Dirs, aggregationStep uint6
 			valuesTable: kv.TblReceiptHistoryVals,
 			compression: seg.CompressNone,
 
-			withLocalityIndex: false, historyLargeValues: false,
+			historyLargeValues: false,
 
 			iiCfg: iiCfg{salt: salt, dirs: dirs, db: db, withExistence: false, compressorCfg: seg.DefaultCfg,
 				aggregationStep: aggregationStep, keysTable: kv.TblReceiptHistoryKeys, valuesTable: kv.TblReceiptIdx},

diff --git a/erigon-lib/state/domain_test.go b/erigon-lib/state/domain_test.go
@@ -97,8 +97,8 @@ func testDbAndDomainOfStep(t *testing.T, aggStep uint64, logger log.Logger) (kv.
 	cfg := domainCfg{
 		name: kv.AccountsDomain, valuesTable: valsTable,
 		hist: histCfg{
-			valuesTable:       historyValsTable,
-			withLocalityIndex: false, compression: seg.CompressNone, historyLargeValues: true,
+			valuesTable: historyValsTable,
+			compression: seg.CompressNone, historyLargeValues: true,
 
 			iiCfg: iiCfg{salt: &salt, dirs: dirs, db: db, withExistence: false,
 				aggregationStep: aggStep, keysTable: historyKeysTable, valuesTable: indexTable},

diff --git a/erigon-lib/state/history.go b/erigon-lib/state/history.go
@@ -93,7 +93,6 @@ type histCfg struct {
 	//   vals: key1+key2+txNum -> value (not DupSort)
 	historyLargeValues bool
 	snapshotsDisabled  bool // don't produce .v and .ef files, keep in db table. old data will be pruned anyway.
-	withLocalityIndex  bool
 	historyDisabled    bool // skip all write operations to this History (even in DB)
 
 	indexList     idxList

diff --git a/erigon-lib/state/history_test.go b/erigon-lib/state/history_test.go
@@ -82,7 +82,7 @@ func testDbAndHistory(tb testing.TB, largeValues bool, logger log.Logger) (kv.Rw
 		iiCfg: iiCfg{salt: &salt, dirs: dirs, db: db, withExistence: false,
 			aggregationStep: 16, filenameBase: "hist", keysTable: keysTable, valuesTable: indexTable,
 		},
-		withLocalityIndex: false, compression: seg.CompressNone, historyLargeValues: largeValues,
+		compression: seg.CompressNone, historyLargeValues: largeValues,
 	}
 	h, err := NewHistory(cfg, logger)
 	require.NoError(tb, err)