db: remove version,versionEdit,versionList aliases

Author: RaduBerinde

checkpoint.go

@@ -515,7 +515,7 @@ func (d *DB) writeCheckpointManifest(
 
 		if len(excludedTables) > 0 || len(excludedBlobFiles) > 0 {
 			// Write out an additional VersionEdit that deletes the excluded SST files.
-			ve := versionEdit{
+			ve := manifest.VersionEdit{
 				DeletedTables:        excludedTables,
 				RemovedBackingTables: removeBackingTables,
 				DeletedBlobFiles:     excludedBlobFiles,

compaction.go

@@ -203,7 +203,7 @@ type compaction struct {
 	comparer  *base.Comparer
 	formatKey base.FormatKey
 	logger    Logger
-	version   *version
+	version   *manifest.Version
 	stats     base.InternalIteratorStats
 	beganAt   time.Time
 	// versionEditApplied is set to true when a compaction has completed and the
@@ -499,7 +499,7 @@ func (c *compaction) maybeSwitchToMoveOrCopy(
 
 func newDeleteOnlyCompaction(
 	opts *Options,
-	cur *version,
+	cur *manifest.Version,
 	inputs []compactionLevel,
 	beganAt time.Time,
 	hints []deleteCompactionHint,
@@ -598,7 +598,7 @@ func adjustGrandparentOverlapBytesForFlush(c *compaction, flushingBytes uint64)
 
 func newFlush(
 	opts *Options,
-	cur *version,
+	cur *manifest.Version,
 	l0Organizer *manifest.L0Organizer,
 	baseLevel int,
 	flushing flushableList,
@@ -739,7 +739,7 @@ func (c *compaction) hasExtraLevelData() bool {
 // errorOnUserKeyOverlap returns an error if the last two written sstables in
 // this compaction have revisions of the same user key present in both sstables,
 // when it shouldn't (eg. when splitting flushes).
-func (c *compaction) errorOnUserKeyOverlap(ve *versionEdit) error {
+func (c *compaction) errorOnUserKeyOverlap(ve *manifest.VersionEdit) error {
 	if n := len(ve.NewTables); n > 1 {
 		meta := ve.NewTables[n-1].Meta
 		prevMeta := ve.NewTables[n-2].Meta
@@ -1336,7 +1336,7 @@ func (d *DB) runIngestFlush(c *compaction) (*manifest.VersionEdit, error) {
 	c.version = d.mu.versions.currentVersion()
 
 	baseLevel := d.mu.versions.picker.getBaseLevel()
-	ve := &versionEdit{}
+	ve := &manifest.VersionEdit{}
 	var ingestSplitFiles []ingestSplitFile
 	ingestFlushable := c.flushing[0].flushable.(*ingestedFlushable)
 
@@ -2245,7 +2245,7 @@ func (h *deleteCompactionHint) canDeleteOrExcise(
 // The files that the resolved hints apply to, are returned as compactionLevels.
 func checkDeleteCompactionHints(
 	cmp Compare,
-	v *version,
+	v *manifest.Version,
 	hints []deleteCompactionHint,
 	snapshots compact.Snapshots,
 	exciseEnabled bool,
@@ -2475,7 +2475,7 @@ func (d *DB) handleCompactFailure(c *compaction, err error) {
 // for the application of a versionEdit that is no longer going to be applied.
 //
 // d.mu must be held when calling this method.
-func (d *DB) cleanupVersionEdit(ve *versionEdit) {
+func (d *DB) cleanupVersionEdit(ve *manifest.VersionEdit) {
 	obsoleteFiles := manifest.ObsoleteFiles{
 		TableBackings: make([]*manifest.TableBacking, 0, len(ve.NewTables)),
 		BlobFiles:     make([]*manifest.BlobFileMetadata, 0, len(ve.NewBlobFiles)),
@@ -2619,7 +2619,7 @@ func (d *DB) compact1(c *compaction, errChannel chan error) (err error) {
 // doing IO.
 func (d *DB) runCopyCompaction(
 	jobID JobID, c *compaction,
-) (ve *versionEdit, stats compact.Stats, _ error) {
+) (ve *manifest.VersionEdit, stats compact.Stats, _ error) {
 	if c.cancel.Load() {
 		return nil, compact.Stats{}, ErrCancelledCompaction
 	}
@@ -2634,7 +2634,7 @@ func (d *DB) runCopyCompaction(
 			inputMeta.TableNum, inputMeta.BlobReferenceDepth, len(inputMeta.BlobReferences),
 		)
 	}
-	ve = &versionEdit{
+	ve = &manifest.VersionEdit{
 		DeletedTables: map[manifest.DeletedTableEntry]*manifest.TableMetadata{
 			{Level: c.startLevel.level, FileNum: inputMeta.TableNum}: inputMeta,
 		},
@@ -2808,7 +2808,7 @@ func (d *DB) applyHintOnFile(
 	f *manifest.TableMetadata,
 	level int,
 	levelMetrics *LevelMetrics,
-	ve *versionEdit,
+	ve *manifest.VersionEdit,
 	hintOverlap deletionHintOverlap,
 ) (newFiles []manifest.NewTableEntry, err error) {
 	if hintOverlap == hintDoesNotApply {
@@ -2844,7 +2844,7 @@ func (d *DB) applyHintOnFile(
 func (d *DB) runDeleteOnlyCompactionForLevel(
 	cl compactionLevel,
 	levelMetrics *LevelMetrics,
-	ve *versionEdit,
+	ve *manifest.VersionEdit,
 	snapshots compact.Snapshots,
 	fragments []deleteCompactionHintFragment,
 	exciseEnabled bool,
@@ -2962,9 +2962,9 @@ func fragmentDeleteCompactionHints(
 // d.mu must *not* be held when calling this.
 func (d *DB) runDeleteOnlyCompaction(
 	jobID JobID, c *compaction, snapshots compact.Snapshots,
-) (ve *versionEdit, stats compact.Stats, retErr error) {
+) (ve *manifest.VersionEdit, stats compact.Stats, retErr error) {
 	fragments := fragmentDeleteCompactionHints(d.cmp, c.deletionHints)
-	ve = &versionEdit{
+	ve = &manifest.VersionEdit{
 		DeletedTables: map[manifest.DeletedTableEntry]*manifest.TableMetadata{},
 	}
 	for _, cl := range c.inputs {
@@ -3003,7 +3003,7 @@ func (d *DB) runDeleteOnlyCompaction(
 
 func (d *DB) runMoveCompaction(
 	jobID JobID, c *compaction,
-) (ve *versionEdit, stats compact.Stats, _ error) {
+) (ve *manifest.VersionEdit, stats compact.Stats, _ error) {
 	iter := c.startLevel.files.Iter()
 	meta := iter.First()
 	if iter.Next() != nil {
@@ -3016,7 +3016,7 @@ func (d *DB) runMoveCompaction(
 		TableBytesMoved: meta.Size,
 		TablesMoved:     1,
 	}
-	ve = &versionEdit{
+	ve = &manifest.VersionEdit{
 		DeletedTables: map[manifest.DeletedTableEntry]*manifest.TableMetadata{
 			{Level: c.startLevel.level, FileNum: meta.TableNum}: meta,
 		},
@@ -3037,7 +3037,7 @@ func (d *DB) runMoveCompaction(
 // re-acquired during the course of this method.
 func (d *DB) runCompaction(
 	jobID JobID, c *compaction,
-) (ve *versionEdit, stats compact.Stats, retErr error) {
+) (ve *manifest.VersionEdit, stats compact.Stats, retErr error) {
 	if c.cancel.Load() {
 		return ve, stats, ErrCancelledCompaction
 	}
@@ -3278,8 +3278,8 @@ func (d *DB) compactAndWrite(
 
 // makeVersionEdit creates the version edit for a compaction, based on the
 // tables in compact.Result.
-func (c *compaction) makeVersionEdit(result compact.Result) (*versionEdit, error) {
-	ve := &versionEdit{
+func (c *compaction) makeVersionEdit(result compact.Result) (*manifest.VersionEdit, error) {
+	ve := &manifest.VersionEdit{
 		DeletedTables: map[manifest.DeletedTableEntry]*manifest.TableMetadata{},
 	}
 	for _, cl := range c.inputs {
@@ -3482,7 +3482,7 @@ func (d *DB) newCompactionOutputObj(
 // validateVersionEdit validates that start and end keys across new and deleted
 // files in a versionEdit pass the given validation function.
 func validateVersionEdit(
-	ve *versionEdit, vk base.ValidateKey, format base.FormatKey, logger Logger,
+	ve *manifest.VersionEdit, vk base.ValidateKey, format base.FormatKey, logger Logger,
 ) {
 	validateKey := func(f *manifest.TableMetadata, key []byte) {
 		if err := vk.Validate(key); err != nil {

compaction_picker.go

@@ -204,7 +204,7 @@ type pickedCompaction struct {
 	// The boundaries of the input data.
 	smallest      InternalKey
 	largest       InternalKey
-	version       *version
+	version       *manifest.Version
 	l0Organizer   *manifest.L0Organizer
 	pickerMetrics pickedCompactionMetrics
 }
@@ -226,7 +226,7 @@ func defaultOutputLevel(startLevel, baseLevel int) int {
 
 func newPickedCompaction(
 	opts *Options,
-	cur *version,
+	cur *manifest.Version,
 	l0Organizer *manifest.L0Organizer,
 	startLevel, outputLevel, baseLevel int,
 ) *pickedCompaction {
@@ -268,7 +268,7 @@ func adjustedOutputLevel(outputLevel int, baseLevel int) int {
 func newPickedCompactionFromL0(
 	lcf *manifest.L0CompactionFiles,
 	opts *Options,
-	vers *version,
+	vers *manifest.Version,
 	l0Organizer *manifest.L0Organizer,
 	baseLevel int,
 	isBase bool,
@@ -579,7 +579,7 @@ func canCompactTables(
 // the newest version. The picker is used under logLock (until a new version is
 // installed).
 func newCompactionPickerByScore(
-	v *version,
+	v *manifest.Version,
 	l0Organizer *manifest.L0Organizer,
 	virtualBackings *manifest.VirtualBackings,
 	opts *Options,
@@ -674,7 +674,7 @@ func totalCompensatedSize(iter iter.Seq[*manifest.TableMetadata]) uint64 {
 // picker is created and initialized every time a new version is installed.
 type compactionPickerByScore struct {
 	opts *Options
-	vers *version
+	vers *manifest.Version
 	// Unlike vers, which is immutable and the latest version when this picker is
 	// created, l0Organizer represents the mutable L0 state of the latest version.
 	// This means that at some point in the future a compactionPickerByScore
@@ -1024,7 +1024,7 @@ func (p *compactionPickerByScore) calculateLevelScores(
 // L0 is special in that files within L0 may overlap one another, so a different
 // set of heuristics that take into account read amplification apply.
 func calculateL0FillFactor(
-	vers *version,
+	vers *manifest.Version,
 	l0Organizer *manifest.L0Organizer,
 	opts *Options,
 	inProgressCompactions []compactionInfo,
@@ -1063,7 +1063,7 @@ func calculateL0FillFactor(
 // function is linear with respect to the number of files in `level` and
 // `outputLevel`.
 func pickCompactionSeedFile(
-	vers *version,
+	vers *manifest.Version,
 	virtualBackings *manifest.VirtualBackings,
 	opts *Options,
 	level, outputLevel int,
@@ -1683,7 +1683,7 @@ func (p *compactionPickerByScore) pickTombstoneDensityCompaction(
 func pickAutoLPositive(
 	env compactionEnv,
 	opts *Options,
-	vers *version,
+	vers *manifest.Version,
 	l0Organizer *manifest.L0Organizer,
 	cInfo candidateLevelInfo,
 	baseLevel int,
@@ -1839,7 +1839,11 @@ func (wa WriteAmpHeuristic) String() string {
 // Helper method to pick compactions originating from L0. Uses information about
 // sublevels to generate a compaction.
 func pickL0(
-	env compactionEnv, opts *Options, vers *version, l0Organizer *manifest.L0Organizer, baseLevel int,
+	env compactionEnv,
+	opts *Options,
+	vers *manifest.Version,
+	l0Organizer *manifest.L0Organizer,
+	baseLevel int,
 ) *pickedCompaction {
 	// It is important to pass information about Lbase files to L0Sublevels
 	// so it can pick a compaction that does not conflict with an Lbase => Lbase+1
@@ -1886,7 +1890,7 @@ func pickL0(
 }
 
 func newPickedManualCompaction(
-	vers *version,
+	vers *manifest.Version,
 	l0Organizer *manifest.L0Organizer,
 	opts *Options,
 	env compactionEnv,
@@ -1949,7 +1953,7 @@ func newPickedManualCompaction(
 // which could be specified as being performed either by a copy compaction of
 // the backing file or a rewrite compaction.
 func pickDownloadCompaction(
-	vers *version,
+	vers *manifest.Version,
 	l0Organizer *manifest.L0Organizer,
 	opts *Options,
 	env compactionEnv,

compaction_picker_test.go

@@ -30,7 +30,7 @@ import (
 
 func loadVersion(
 	t *testing.T, d *datadriven.TestData,
-) (*version, *manifest.L0Organizer, *Options, string) {
+) (*manifest.Version, *manifest.L0Organizer, *Options, string) {
 	var sizes [numLevels]int64
 	opts := &Options{}
 	opts.testingRandomized(t)
@@ -146,7 +146,7 @@ func TestCompactionPickerByScoreLevelMaxBytes(t *testing.T) {
 }
 
 func TestCompactionPickerTargetLevel(t *testing.T) {
-	var vers *version
+	var vers *manifest.Version
 	var l0Organizer *manifest.L0Organizer
 	var opts *Options
 	var pickerByScore *compactionPickerByScore

compaction_test.go

@@ -43,14 +43,14 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func newVersion(opts *Options, files [numLevels][]*manifest.TableMetadata) *version {
+func newVersion(opts *Options, files [numLevels][]*manifest.TableMetadata) *manifest.Version {
 	v, _ := newVersionAndL0Organizer(opts, files)
 	return v
 }
 
 func newVersionAndL0Organizer(
 	opts *Options, files [numLevels][]*manifest.TableMetadata,
-) (*version, *manifest.L0Organizer) {
+) (*manifest.Version, *manifest.L0Organizer) {
 	l0Organizer := manifest.NewL0Organizer(opts.Comparer, opts.FlushSplitBytes)
 	v := manifest.NewVersionForTesting(
 		opts.Comparer,
@@ -702,13 +702,13 @@ func TestValidateVersionEdit(t *testing.T) {
 
 	testCases := []struct {
 		desc    string
-		ve      *versionEdit
+		ve      *manifest.VersionEdit
 		vFunc   func([]byte) error
 		wantErr error
 	}{
 		{
 			desc: "single new file; start key",
-			ve: &versionEdit{
+			ve: &manifest.VersionEdit{
 				NewTables: []manifest.NewTableEntry{
 					{
 						Meta: newFileMeta(
@@ -723,7 +723,7 @@ func TestValidateVersionEdit(t *testing.T) {
 		},
 		{
 			desc: "single new file; end key",
-			ve: &versionEdit{
+			ve: &manifest.VersionEdit{
 				NewTables: []manifest.NewTableEntry{
 					{
 						Meta: newFileMeta(
@@ -738,7 +738,7 @@ func TestValidateVersionEdit(t *testing.T) {
 		},
 		{
 			desc: "multiple new files",
-			ve: &versionEdit{
+			ve: &manifest.VersionEdit{
 				NewTables: []manifest.NewTableEntry{
 					{
 						Meta: newFileMeta(
@@ -759,7 +759,7 @@ func TestValidateVersionEdit(t *testing.T) {
 		},
 		{
 			desc: "single deleted file; start key",
-			ve: &versionEdit{
+			ve: &manifest.VersionEdit{
 				DeletedTables: map[manifest.DeletedTableEntry]*manifest.TableMetadata{
 					{Level: 0, FileNum: 0}: newFileMeta(
 						manifest.InternalKey{UserKey: []byte(badKey)},
@@ -772,7 +772,7 @@ func TestValidateVersionEdit(t *testing.T) {
 		},
 		{
 			desc: "single deleted file; end key",
-			ve: &versionEdit{
+			ve: &manifest.VersionEdit{
 				DeletedTables: map[manifest.DeletedTableEntry]*manifest.TableMetadata{
 					{Level: 0, FileNum: 0}: newFileMeta(
 						manifest.InternalKey{UserKey: []byte("a")},
@@ -785,7 +785,7 @@ func TestValidateVersionEdit(t *testing.T) {
 		},
 		{
 			desc: "multiple deleted files",
-			ve: &versionEdit{
+			ve: &manifest.VersionEdit{
 				DeletedTables: map[manifest.DeletedTableEntry]*manifest.TableMetadata{
 					{Level: 0, FileNum: 0}: newFileMeta(
 						manifest.InternalKey{UserKey: []byte("a")},
@@ -802,7 +802,7 @@ func TestValidateVersionEdit(t *testing.T) {
 		},
 		{
 			desc: "no errors",
-			ve: &versionEdit{
+			ve: &manifest.VersionEdit{
 				NewTables: []manifest.NewTableEntry{
 					{
 						Level: 0,
@@ -2185,7 +2185,7 @@ func TestCompactionErrorOnUserKeyOverlap(t *testing.T) {
 				}
 
 				result := "OK"
-				ve := &versionEdit{
+				ve := &manifest.VersionEdit{
 					NewTables: files,
 				}
 				if err := c.errorOnUserKeyOverlap(ve); err != nil {
@@ -3163,7 +3163,7 @@ func TestCompactionCorruption(t *testing.T) {
 }
 
 func hasExternalFiles(d *DB) bool {
-	v := func() *version {
+	v := func() *manifest.Version {
 		d.mu.Lock()
 		defer d.mu.Unlock()