Skip to content

[wip] [3.6] commitment: skip GetLatest for keys creation #21790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taratorio merged 3 commits into from
Jun 15, 2026
+105 −22
Merged

[wip] [3.6] commitment: skip GetLatest for keys creation #21790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb6bcfe
execution/commitment: skip prev lookup for new branch nodes
AskAlexSharov Jun 13, 2026
132ed2f
save
AskAlexSharov Jun 14, 2026
09564b4
kick ci
AskAlexSharov Jun 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 30 additions & 19 deletions execution/commitment/commitment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,23 +566,29 @@ func (be *BranchEncoder) CollectUpdate(
prefix []byte,
bitmap, touchMap, afterMap uint16,
cells *[16]cellEncodeData,
isNew bool,
) error {
var prev []byte
var foundInCache bool
var err error

if be.cache != nil {
prev, foundInCache = be.cache.GetAndEvictBranch(prefix)
if foundInCache && be.metrics != nil {
be.metrics.cacheBranch.Add(1)
if !isNew {
if be.cache != nil {
prev, foundInCache = be.cache.GetAndEvictBranch(prefix)
if foundInCache && be.metrics != nil {
be.metrics.cacheBranch.Add(1)
}
}
}
if !foundInCache {
prev, _, err = ctx.Branch(prefix)
if err != nil {
return err
if !foundInCache {
prev, _, err = ctx.Branch(prefix)
if err != nil {
return err
}
}
}
if prev == nil {
prev = []byte{}
}

update, err := be.EncodeBranch(bitmap, touchMap, afterMap, cells)
if err != nil {
Expand Down Expand Up @@ -624,6 +630,7 @@ func (be *BranchEncoder) CollectDeferredUpdate(
prefix []byte,
bitmap, touchMap, afterMap uint16,
cells *[16]cellEncodeData,
isNew bool,
) error {
// Flush if duplicate prefix or too many deferred updates
limit := be.maxDeferredUpdates
Expand All @@ -642,24 +649,28 @@ func (be *BranchEncoder) CollectDeferredUpdate(
be.ClearDeferred()
}

// try to get previous data from cache
var (
prev []byte
foundInCache bool
err error
)

if be.cache != nil {
prev, foundInCache = be.cache.GetAndEvictBranch(prefix)
if foundInCache && be.metrics != nil {
be.metrics.cacheBranch.Add(1)
if !isNew {
if be.cache != nil {
prev, foundInCache = be.cache.GetAndEvictBranch(prefix)
if foundInCache && be.metrics != nil {
be.metrics.cacheBranch.Add(1)
}
}
if !foundInCache {
prev, _, err = ctx.Branch(prefix)
}
if err != nil {
return err
}
}
if !foundInCache {
prev, _, err = ctx.Branch(prefix)
}
if err != nil {
return err
if prev == nil {
prev = []byte{}
}

// Track this prefix as pending
Expand Down
72 changes: 72 additions & 0 deletions execution/commitment/commitment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,78 @@ func TestUpdates_TouchPlainKey(t *testing.T) {
require.NoError(t, err)
}

// recordingCtx captures Branch call count and PutBranch arguments for assertions.
type recordingCtx struct {
branchCalls int
puts []struct{ prefix, data, prev []byte }
}

func (r *recordingCtx) Branch(_ []byte) ([]byte, kv.Step, error) {
r.branchCalls++
return nil, 0, nil
}
func (r *recordingCtx) PutBranch(prefix, data, prev []byte) error {
r.puts = append(r.puts, struct{ prefix, data, prev []byte }{
common.Copy(prefix), common.Copy(data), common.Copy(prev),
})
return nil
}
func (r *recordingCtx) Account(_ []byte) (*Update, error) { return nil, nil }
func (r *recordingCtx) Storage(_ []byte) (*Update, error) { return nil, nil }
func (r *recordingCtx) TxNum() uint64 { return 0 }

func TestCollectUpdate_IsNewSkipsLookupAndMatchesNilPath(t *testing.T) {
t.Parallel()
prefix := []byte{0xab, 0xcd}
row, bm := generateCellRow(t, 4)
cells := generateCellEncodeDataRow(t, row, bm)

// isNew=false: Branch is probed but returns nil (key doesn't exist yet)
ctxA := &recordingCtx{}
beA := NewBranchEncoder(1024)
require.NoError(t, beA.CollectUpdate(ctxA, prefix, bm, bm, bm, &cells, false))
require.Equal(t, 1, ctxA.branchCalls, "isNew=false must probe Branch")
require.Len(t, ctxA.puts, 1)

// isNew=true: Branch must not be called, but PutBranch output must be identical
ctxB := &recordingCtx{}
beB := NewBranchEncoder(1024)
require.NoError(t, beB.CollectUpdate(ctxB, prefix, bm, bm, bm, &cells, true))
require.Equal(t, 0, ctxB.branchCalls, "isNew=true must not probe Branch")
require.Len(t, ctxB.puts, 1)

require.Equal(t, ctxA.puts[0].data, ctxB.puts[0].data)
require.Equal(t, ctxA.puts[0].prev, ctxB.puts[0].prev)
}

func TestCollectDeferredUpdate_IsNewSkipsLookupAndMatchesNilPath(t *testing.T) {
t.Parallel()
prefix := []byte{0x11, 0x22}
row, bm := generateCellRow(t, 4)
cells := generateCellEncodeDataRow(t, row, bm)

// isNew=false: Branch is probed but returns nil
ctxA := &recordingCtx{}
beA := NewBranchEncoder(1024)
beA.setDeferUpdates(true)
require.NoError(t, beA.CollectDeferredUpdate(ctxA, prefix, bm, bm, bm, &cells, false))
require.NoError(t, beA.ApplyDeferredUpdates(1, ctxA.PutBranch))
require.Equal(t, 1, ctxA.branchCalls, "isNew=false must probe Branch")
require.Len(t, ctxA.puts, 1)

// isNew=true: Branch must not be called, deferred output must match
ctxB := &recordingCtx{}
beB := NewBranchEncoder(1024)
beB.setDeferUpdates(true)
require.NoError(t, beB.CollectDeferredUpdate(ctxB, prefix, bm, bm, bm, &cells, true))
require.NoError(t, beB.ApplyDeferredUpdates(1, ctxB.PutBranch))
require.Equal(t, 0, ctxB.branchCalls, "isNew=true must not probe Branch")
require.Len(t, ctxB.puts, 1)

require.Equal(t, ctxA.puts[0].data, ctxB.puts[0].data)
require.Equal(t, ctxA.puts[0].prev, ctxB.puts[0].prev)
}

func TestUpdates_TouchStorageClearsDeleteOnRewrite(t *testing.T) {
t.Parallel()

Expand Down
6 changes: 3 additions & 3 deletions execution/commitment/hex_patricia_hashed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1959,11 +1959,11 @@ func (hph *HexPatriciaHashed) foldBranch(row int, nibble, upDepth, depth int16,
}

if hph.branchEncoder.DeferUpdatesEnabled() {
if err := hph.branchEncoder.CollectDeferredUpdate(hph.ctx, updateKey, bitmap, hph.touchMap[row], hph.afterMap[row], &cellData); err != nil {
if err := hph.branchEncoder.CollectDeferredUpdate(hph.ctx, updateKey, bitmap, hph.touchMap[row], hph.afterMap[row], &cellData, !hph.branchBefore[row]); err != nil {
return fmt.Errorf("failed to collect deferred branch update: %w", err)
}
} else {
if err := hph.branchEncoder.CollectUpdate(hph.ctx, updateKey, bitmap, hph.touchMap[row], hph.afterMap[row], &cellData); err != nil {
if err := hph.branchEncoder.CollectUpdate(hph.ctx, updateKey, bitmap, hph.touchMap[row], hph.afterMap[row], &cellData, !hph.branchBefore[row]); err != nil {
return fmt.Errorf("failed to encode branch update: %w", err)
}
}
Expand Down Expand Up @@ -2231,7 +2231,7 @@ func (hph *HexPatriciaHashed) foldDelete(row int, nibble, upDepth int16, upCell
// If evictCache is true, it also evicts the branch from the cache.
func (hph *HexPatriciaHashed) collectDeleteUpdate(updateKey []byte, row int, evictCache bool) error {
if hph.branchBefore[row] {
if err := hph.branchEncoder.CollectUpdate(hph.ctx, updateKey, 0, hph.touchMap[row], 0, nil); err != nil {
if err := hph.branchEncoder.CollectUpdate(hph.ctx, updateKey, 0, hph.touchMap[row], 0, nil, false); err != nil {
return fmt.Errorf("failed to encode leaf node update: %w", err)
}
if evictCache && hph.cache != nil {
Expand Down
Loading