diffs: no overflow pages (#12756)

erigon-lib/kv/mdbx/kv_mdbx.go

@@ -143,6 +143,7 @@ func (opts MdbxOpts) InMem(tmpDir string) MdbxOpts {
 	opts.dirtySpace = uint64(64 * datasize.MB)
 	opts.shrinkThreshold = 0 // disable
 	opts.label = kv.InMem
+	opts.pageSize = 4096
 	return opts
 }
 

erigon-lib/state/aggregator_test.go

@@ -881,19 +881,18 @@ func generateKV(tb testing.TB, tmp string, keySize, valueSize, keyCount int, log
 	return compPath
 }
 
-func testDbAndAggregatorv3(t *testing.T, aggStep uint64) (kv.RwDB, *Aggregator) {
-	t.Helper()
-	require := require.New(t)
-	dirs := datadir.New(t.TempDir())
-	logger := log.New()
+func testDbAndAggregatorv3(tb testing.TB, aggStep uint64) (kv.RwDB, *Aggregator) {
+	tb.Helper()
+	require, logger := require.New(tb), log.New()
+	dirs := datadir.New(tb.TempDir())
 	db := mdbx.NewMDBX(logger).InMem(dirs.Chaindata).GrowthStep(32 * datasize.MB).MapSize(2 * datasize.GB).WithTableCfg(func(defaultBuckets kv.TableCfg) kv.TableCfg {
 		return kv.ChaindataTablesCfg
 	}).MustOpen()
-	t.Cleanup(db.Close)
+	tb.Cleanup(db.Close)
 
 	agg, err := NewAggregator(context.Background(), dirs, aggStep, db, logger)
 	require.NoError(err)
-	t.Cleanup(agg.Close)
+	tb.Cleanup(agg.Close)
 	err = agg.OpenFolder()
 	require.NoError(err)
 	agg.DisableFsync()

erigon-lib/state/squeeze_test.go

@@ -22,7 +22,7 @@ type testAggConfig struct {
 func testDbAggregatorWithFiles(tb testing.TB, cfg *testAggConfig) (kv.RwDB, *Aggregator) {
 	tb.Helper()
 
-	db, agg := testDbAndAggregatorv3(tb.(*testing.T), cfg.stepSize)
+	db, agg := testDbAndAggregatorv3(tb, cfg.stepSize)
 	agg.commitmentValuesTransform = !cfg.disableCommitmentBranchTransform
 	agg.d[kv.CommitmentDomain].replaceKeysInValues = agg.commitmentValuesTransform
 

erigon-lib/state/state_changeset.go

@@ -267,6 +267,7 @@ func DeserializeKeys(in []byte) [kv.DomainLen][]DomainEntryDiff {
 	return ret
 }
 
+const diffChunkKeyLen = 48
 const diffChunkLen = 4*1024 - 32
 
 func WriteDiffSet(tx kv.RwTx, blockNumber uint64, blockHash common.Hash, diffSet *StateChangeSet) error {
@@ -281,7 +282,7 @@ func WriteDiffSet(tx kv.RwTx, blockNumber uint64, blockHash common.Hash, diffSet
 		return err
 	}
 
-	key := make([]byte, 48)
+	key := make([]byte, diffChunkKeyLen)
 	for i := 0; i < chunkCount; i++ {
 		start := i * diffChunkLen
 		end := (i + 1) * diffChunkLen

erigon-lib/state/state_changeset_test.go

@@ -17,12 +17,34 @@
 package state
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
+	"github.com/erigontech/erigon-lib/kv"
+	"github.com/erigontech/erigon-lib/kv/mdbx"
 	"github.com/stretchr/testify/require"
 )
 
+func TestOverflowPages(t *testing.T) {
+	db, _ := testDbAndAggregatorv3(t, 10)
+	ctx := context.Background()
+	tx, err := db.BeginRw(ctx)
+	require.NoError(t, err)
+	defer tx.Rollback()
+	k, v := make([]byte, diffChunkKeyLen), make([]byte, diffChunkLen)
+	k[0] = 0
+	_ = tx.Put(kv.ChangeSets3, k, v)
+	k[0] = 1
+	_ = tx.Put(kv.ChangeSets3, k, v)
+	st, err := tx.(*mdbx.MdbxTx).BucketStat(kv.ChangeSets3)
+	require.NoError(t, err)
+	require.Equal(t, 2, int(st.OverflowPages))
+	require.Equal(t, 1, int(st.LeafPages))
+	require.Equal(t, 2, int(st.Entries))
+	require.Equal(t, 2, int(st.Entries))
+}
+
 func TestSerializeDeserializeDiff(t *testing.T) {
 	t.Parallel()