performance: Don't preallocate rarely used maps in MakeStateDelta

ledger/internal/appcow_test.go

@@ -119,7 +119,7 @@ func getCow(creatables []modsData) *roundCowState {
 		proto: config.Consensus[protocol.ConsensusCurrentVersion],
 	}
 	for _, e := range creatables {
-		cs.mods.Creatables[e.cidx] = ledgercore.ModifiedCreatable{Ctype: e.ctype, Creator: e.addr, Created: true}
+		cs.mods.UpsertCreatable(e.cidx, ledgercore.ModifiedCreatable{Ctype: e.ctype, Creator: e.addr, Created: true})
 	}
 	return cs
 }

ledger/internal/assetcow.go

@@ -23,22 +23,28 @@ import (
 
 func (cs *roundCowState) AllocateAsset(addr basics.Address, index basics.AssetIndex, global bool) error {
 	if global {
-		cs.mods.Creatables[basics.CreatableIndex(index)] = ledgercore.ModifiedCreatable{
-			Ctype:   basics.AssetCreatable,
-			Creator: addr,
-			Created: true,
-		}
+		cs.mods.UpsertCreatable(
+			basics.CreatableIndex(index),
+			ledgercore.ModifiedCreatable{
+				Ctype:   basics.AssetCreatable,
+				Creator: addr,
+				Created: true,
+			},
+		)
 	}
 	return nil
 }
 
 func (cs *roundCowState) DeallocateAsset(addr basics.Address, index basics.AssetIndex, global bool) error {
 	if global {
-		cs.mods.Creatables[basics.CreatableIndex(index)] = ledgercore.ModifiedCreatable{
-			Ctype:   basics.AssetCreatable,
-			Creator: addr,
-			Created: false,
-		}
+		cs.mods.UpsertCreatable(
+			basics.CreatableIndex(index),
+			ledgercore.ModifiedCreatable{
+				Ctype:   basics.AssetCreatable,
+				Creator: addr,
+				Created: false,
+			},
+		)
 	}
 	return nil
 }

ledger/internal/cow.go

@@ -253,7 +253,7 @@ func (cb *roundCowState) addTx(txn transactions.Transaction, txid transactions.T
 	cb.mods.Txids[txid] = ledgercore.IncludedTransactions{LastValid: txn.LastValid, Intra: uint64(len(cb.mods.Txids))}
 	cb.incTxnCount()
 	if txn.Lease != [32]byte{} {
-		cb.mods.Txleases[ledgercore.Txlease{Sender: txn.Sender, Lease: txn.Lease}] = txn.LastValid
+		cb.mods.UpsertTxLease(ledgercore.Txlease{Sender: txn.Sender, Lease: txn.Lease}, txn.LastValid)
 	}
 }
 
@@ -287,10 +287,10 @@ func (cb *roundCowState) commitToParent() {
 	cb.commitParent.txnCount += cb.txnCount
 
 	for txl, expires := range cb.mods.Txleases {
-		cb.commitParent.mods.Txleases[txl] = expires
+		cb.commitParent.mods.UpsertTxLease(txl, expires)
 	}
 	for cidx, delta := range cb.mods.Creatables {
-		cb.commitParent.mods.Creatables[cidx] = delta
+		cb.commitParent.mods.UpsertCreatable(cidx, delta)
 	}
 	for addr, smod := range cb.sdeltas {
 		for aapp, nsd := range smod {

ledger/ledgercore/statedelta.go

@@ -96,9 +96,11 @@ type StateDelta struct {
 	Txids map[transactions.Txid]IncludedTransactions
 
 	// new txleases for the txtail mapped to expiration
+	// not pre-allocated so use .UpsertTxleases to modify instead of direct assignment
 	Txleases map[Txlease]basics.Round
 
 	// new creatables creator lookup table
+	// not pre-allocated so use .UpsertCreatables to modify instead of direct assignment
 	Creatables map[basics.CreatableIndex]ModifiedCreatable
 
 	// new block header; read-only
@@ -180,9 +182,11 @@ type AccountDeltas struct {
 	// AppResources deltas. If app params or local state is deleted, there is a nil value in AppResources.Params or AppResources.State and Deleted flag set
 	AppResources []AppResourceRecord
 	// caches for {addr, app id} to app params delta resolution
+	// not preallocated - use UpsertAppResource instead of inserting directly
 	appResourcesCache map[AccountApp]int
 
-	AssetResources      []AssetResourceRecord
+	AssetResources []AssetResourceRecord
+	// not preallocated - use UpsertAssertResource instead of inserting directly
 	assetResourcesCache map[AccountAsset]int
 }
 
@@ -191,12 +195,10 @@ type AccountDeltas struct {
 // This does not play well for AssetConfig and ApplicationCall transactions on scale
 func MakeStateDelta(hdr *bookkeeping.BlockHeader, prevTimestamp int64, hint int, stateProofNext basics.Round) StateDelta {
 	return StateDelta{
-		Accts:    MakeAccountDeltas(hint),
-		KvMods:   make(map[string]KvValueDelta),
-		Txids:    make(map[transactions.Txid]IncludedTransactions, hint),
-		Txleases: make(map[Txlease]basics.Round),
+		Accts:  MakeAccountDeltas(hint),
+		KvMods: make(map[string]KvValueDelta),
+		Txids:  make(map[transactions.Txid]IncludedTransactions, hint),
 		// asset or application creation are considered as rare events so do not pre-allocate space for them
-		Creatables:               make(map[basics.CreatableIndex]ModifiedCreatable),
 		Hdr:                      hdr,
 		StateProofNext:           stateProofNext,
 		PrevTimestamp:            prevTimestamp,
@@ -209,9 +211,6 @@ func MakeAccountDeltas(hint int) AccountDeltas {
 	return AccountDeltas{
 		Accts:      make([]BalanceRecord, 0, hint*2),
 		acctsCache: make(map[basics.Address]int, hint*2),
-
-		appResourcesCache:   make(map[AccountApp]int),
-		assetResourcesCache: make(map[AccountAsset]int),
 	}
 }
 
@@ -403,6 +402,22 @@ func (ad *AccountDeltas) UpsertAssetResource(addr basics.Address, aidx basics.As
 	ad.assetResourcesCache[key] = last
 }
 
+// UpsertTxLease adds a new TxLease to the StateDelta
+func (sd *StateDelta) UpsertTxLease(txLease Txlease, expired basics.Round) {
+	if sd.Txleases == nil {
+		sd.Txleases = make(map[Txlease]basics.Round)
+	}
+	sd.Txleases[txLease] = expired
+}
+
+// UpsertCreatable adds a new Creatable to the StateDelta
+func (sd *StateDelta) UpsertCreatable(idx basics.CreatableIndex, creatable ModifiedCreatable) {
+	if sd.Creatables == nil {
+		sd.Creatables = make(map[basics.CreatableIndex]ModifiedCreatable)
+	}
+	sd.Creatables[idx] = creatable
+}
+
 // OptimizeAllocatedMemory by reallocating maps to needed capacity
 // For each data structure, reallocate if it would save us at least 50MB aggregate
 // If provided maxBalLookback or maxTxnLife are zero, dependent optimizations will not occur.

ledger/ledgercore/statedelta_test.go

@@ -96,6 +96,28 @@ func TestAccountDeltas(t *testing.T) {
 	a.Equal(sample1, data)
 }
 
+func TestMakeStateDeltaMaps(t *testing.T) {
+	partitiontest.PartitionTest(t)
+
+	sd := MakeStateDelta(nil, 0, 23000, basics.Round(2))
+	require.Nil(t, sd.Txleases)
+	require.Nil(t, sd.Creatables)
+
+	sd.UpsertTxLease(Txlease{}, basics.Round(10))
+	require.Equal(t, 1, len(sd.Txleases))
+	sd.UpsertCreatable(basics.CreatableIndex(5), ModifiedCreatable{})
+	require.Equal(t, 1, len(sd.Creatables))
+
+	txLeaseMap := make(map[Txlease]basics.Round)
+	txLeaseMap[Txlease{}] = basics.Round(10)
+	require.Equal(t, sd.Txleases, txLeaseMap)
+
+	creatableMap := make(map[basics.CreatableIndex]ModifiedCreatable)
+	creatableMap[basics.CreatableIndex(5)] = ModifiedCreatable{}
+	require.Equal(t, sd.Creatables, creatableMap)
+
+}
+
 func BenchmarkMakeStateDelta(b *testing.B) {
 	hint := 23000
 	b.ReportAllocs()

ledger/txtail.go

@@ -213,6 +213,9 @@ func (t *txTail) newBlock(blk bookkeeping.Block, delta ledgercore.StateDelta) {
 
 	t.tailMu.Lock()
 	defer t.tailMu.Unlock()
+	if delta.Txleases == nil {
+		delta.Txleases = make(map[ledgercore.Txlease]basics.Round)
+	}
 	t.recent[rnd] = roundLeases{
 		txleases: delta.Txleases,
 		proto:    config.Consensus[blk.CurrentProtocol],

ledger/txtail_test.go

@@ -279,7 +279,7 @@ func TestTxTailDeltaTracking(t *testing.T) {
 					LastValid: basics.Round(i + 50),
 					Intra:     0,
 				}
-				deltas.Txleases[ledgercore.Txlease{Sender: blk.Payset[0].Txn.Sender, Lease: blk.Payset[0].Txn.Lease}] = basics.Round(i + 50)
+				deltas.UpsertTxLease(ledgercore.Txlease{Sender: blk.Payset[0].Txn.Sender, Lease: blk.Payset[0].Txn.Lease}, basics.Round(i+50))
 
 				txtail.newBlock(blk, deltas)
 				txtail.committedUpTo(basics.Round(i))