Repository navigation
Conversation
Methods from merge_surface.go, merge_accessor.go, rollback_expansion.go and expand_write_path_stats.go move to the Expansion sub-type with the fields only they use. Bodies are unchanged beyond the receiver rewrite. Co-authored-by: Cursor <cursoragent@cursor.com>
ggreer
approved these changes
Oct 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stacked on #1206. Third
pebble.Enginesplit: the 15 methods frommerge_surface.go,merge_accessor.go,rollback_expansion.go,expand_write_path_stats.gomove toExpansion, same shape asDigestsandSyncRuns. Bodies unchanged beyonde.→x.e..Two things differ from the plan's table.
synthLayerand the four write counters stay onEngine:grants.gowrites them, so they are shared with the record path, not owned here;ExpandWritePathStatsreads them throughx.e. AndExpansioncarries the raw Pebble surface the compactor uses (NewIter,Get,IngestSSTs,NewFoldBatch,DropKeyRange,ReplaceRangeWithSSTs,Metrics,EstimateDiskUsage,LogCompactionMetrics,UnsafeForTesting,PebbleEngine) because those lived inmerge_surface.go/merge_accessor.go. If that name reads wrong for the compactor's use, it is a rename, not a re-split.Callers go through
Expansion():pebble_store.go(RollbackExpansion),adapter_reader.go(NewIter), andpkg/synccompactor/pebble/{compactor,kway,merge,overlay}.go. No forwarders, no newpebbleStoremethods, export status unchanged.Checks:
go build ./...,go vet ./...,golangci-lintclean;go test ./pkg/dotc1z/... -count=1ok includingTestWriteMuHolders; focused-run 'Expan|Merge|Rollback|Synth|Layer'acrosspkg/syncandpkg/synccompactorok.