db: remove newTableEntry alias

Author: RaduBerinde

compaction.go

@@ -1340,7 +1340,7 @@ func (d *DB) runIngestFlush(c *compaction) (*manifest.VersionEdit, error) {
 	var ingestSplitFiles []ingestSplitFile
 	ingestFlushable := c.flushing[0].flushable.(*ingestedFlushable)
 
-	updateLevelMetricsOnExcise := func(m *manifest.TableMetadata, level int, added []newTableEntry) {
+	updateLevelMetricsOnExcise := func(m *manifest.TableMetadata, level int, added []manifest.NewTableEntry) {
 		levelMetrics := c.metrics[level]
 		if levelMetrics == nil {
 			levelMetrics = &LevelMetrics{}
@@ -1374,7 +1374,7 @@ func (d *DB) runIngestFlush(c *compaction) (*manifest.VersionEdit, error) {
 		},
 		v: c.version,
 	}
-	replacedTables := make(map[base.TableNum][]newTableEntry)
+	replacedTables := make(map[base.TableNum][]manifest.NewTableEntry)
 	for _, file := range ingestFlushable.files {
 		var fileToSplit *manifest.TableMetadata
 		var level int
@@ -1399,7 +1399,7 @@ func (d *DB) runIngestFlush(c *compaction) (*manifest.VersionEdit, error) {
 		}
 
 		// Add the current flushableIngest file to the version.
-		ve.NewTables = append(ve.NewTables, newTableEntry{Level: level, Meta: file})
+		ve.NewTables = append(ve.NewTables, manifest.NewTableEntry{Level: level, Meta: file})
 		if fileToSplit != nil {
 			ingestSplitFiles = append(ingestSplitFiles, ingestSplitFile{
 				ingestFile: file,
@@ -2778,7 +2778,7 @@ func (d *DB) runCopyCompaction(
 		}
 		deleteOnExit = true
 	}
-	ve.NewTables = []newTableEntry{{
+	ve.NewTables = []manifest.NewTableEntry{{
 		Level: c.outputLevel.level,
 		Meta:  newMeta,
 	}}
@@ -3020,7 +3020,7 @@ func (d *DB) runMoveCompaction(
 		DeletedTables: map[manifest.DeletedTableEntry]*manifest.TableMetadata{
 			{Level: c.startLevel.level, FileNum: meta.TableNum}: meta,
 		},
-		NewTables: []newTableEntry{
+		NewTables: []manifest.NewTableEntry{
 			{Level: c.outputLevel.level, Meta: meta},
 		},
 	}
@@ -3324,7 +3324,7 @@ func (c *compaction) makeVersionEdit(result compact.Result) (*versionEdit, error
 	}
 
 	inputLargestSeqNumAbsolute := c.inputLargestSeqNumAbsolute()
-	ve.NewTables = make([]newTableEntry, len(result.Tables))
+	ve.NewTables = make([]manifest.NewTableEntry, len(result.Tables))
 	for i := range result.Tables {
 		t := &result.Tables[i]
 
@@ -3371,7 +3371,7 @@ func (c *compaction) makeVersionEdit(result compact.Result) (*versionEdit, error
 			fileMeta.ExtendRangeKeyBounds(c.cmp, t.WriterMeta.SmallestRangeKey, t.WriterMeta.LargestRangeKey)
 		}
 
-		ve.NewTables[i] = newTableEntry{
+		ve.NewTables[i] = manifest.NewTableEntry{
 			Level: c.outputLevel.level,
 			Meta:  fileMeta,
 		}

data_test.go

@@ -984,7 +984,7 @@ func runDBDefineCmdReuseFS(td *datadriven.TestData, opts *Options) (*DB, error)
 			if largestSeqNum <= f.Meta.LargestSeqNum {
 				largestSeqNum = f.Meta.LargestSeqNum + 1
 			}
-			ve.NewTables = append(ve.NewTables, newTableEntry{
+			ve.NewTables = append(ve.NewTables, manifest.NewTableEntry{
 				Level: level,
 				Meta:  f.Meta,
 			})

db.go

@@ -493,7 +493,7 @@ type DB struct {
 			// pending is a slice of metadata for sstables waiting to be
 			// validated. Only physical sstables should be added to the pending
 			// queue.
-			pending []newTableEntry
+			pending []manifest.NewTableEntry
 			// validating is set to true when validation is running.
 			validating bool
 		}

excise.go

@@ -490,10 +490,10 @@ func applyExciseToVersionEdit(
 	}
 	originalLen := len(ve.NewTables)
 	if leftTable != nil {
-		ve.NewTables = append(ve.NewTables, newTableEntry{Level: level, Meta: leftTable})
+		ve.NewTables = append(ve.NewTables, manifest.NewTableEntry{Level: level, Meta: leftTable})
 	}
 	if rightTable != nil {
-		ve.NewTables = append(ve.NewTables, newTableEntry{Level: level, Meta: rightTable})
+		ve.NewTables = append(ve.NewTables, manifest.NewTableEntry{Level: level, Meta: rightTable})
 	}
 	return ve.NewTables[originalLen:]
 }

ingest.go

@@ -1785,9 +1785,9 @@ type ingestSplitFile struct {
 func (d *DB) ingestSplit(
 	ctx context.Context,
 	ve *versionEdit,
-	updateMetrics func(*manifest.TableMetadata, int, []newTableEntry),
+	updateMetrics func(*manifest.TableMetadata, int, []manifest.NewTableEntry),
 	files []ingestSplitFile,
-	replacedTables map[base.TableNum][]newTableEntry,
+	replacedTables map[base.TableNum][]manifest.NewTableEntry,
 ) error {
 	for _, s := range files {
 		ingestFileBounds := s.ingestFile.UserKeyBounds()
@@ -1893,7 +1893,7 @@ func (d *DB) ingestApply(
 	defer d.mu.Unlock()
 
 	ve := &versionEdit{
-		NewTables: make([]newTableEntry, lr.fileCount()),
+		NewTables: make([]manifest.NewTableEntry, lr.fileCount()),
 	}
 	if exciseSpan.Valid() || (d.opts.Experimental.IngestSplit != nil && d.opts.Experimental.IngestSplit()) {
 		ve.DeletedTables = map[manifest.DeletedTableEntry]*manifest.TableMetadata{}
@@ -2046,8 +2046,8 @@ func (d *DB) ingestApply(
 		// possible for a file that we want to split to no longer exist or have a
 		// newer fileMetadata due to a split induced by another ingestion file, or an
 		// excise.
-		replacedTables := make(map[base.TableNum][]newTableEntry)
-		updateLevelMetricsOnExcise := func(m *manifest.TableMetadata, level int, added []newTableEntry) {
+		replacedTables := make(map[base.TableNum][]manifest.NewTableEntry)
+		updateLevelMetricsOnExcise := func(m *manifest.TableMetadata, level int, added []manifest.NewTableEntry) {
 			levelMetrics := metrics[level]
 			if levelMetrics == nil {
 				levelMetrics = &LevelMetrics{}
@@ -2197,7 +2197,7 @@ func (d *DB) ingestApply(
 // block checksums for the backing file will be validated twice.
 //
 // DB.mu must be locked when calling.
-func (d *DB) maybeValidateSSTablesLocked(newFiles []newTableEntry) {
+func (d *DB) maybeValidateSSTablesLocked(newFiles []manifest.NewTableEntry) {
 	// Only add to the validation queue when the feature is enabled.
 	if !d.opts.Experimental.ValidateOnIngest {
 		return

version_set.go

@@ -25,7 +25,6 @@ const numLevels = manifest.NumLevels
 const manifestMarkerName = `manifest`
 
 // Provide type aliases for the various manifest structs.
-type newTableEntry = manifest.NewTableEntry
 type version = manifest.Version
 type versionEdit = manifest.VersionEdit
 type versionList = manifest.VersionList
@@ -1046,7 +1045,7 @@ func (vs *versionSet) createManifest(
 	// Add all extant sstables in the current version.
 	for level, levelMetadata := range vs.currentVersion().Levels {
 		for meta := range levelMetadata.All() {
-			snapshot.NewTables = append(snapshot.NewTables, newTableEntry{
+			snapshot.NewTables = append(snapshot.NewTables, manifest.NewTableEntry{
 				Level: level,
 				Meta:  meta,
 			})