manifest: rename AddedTablesByFileNum to AllAddedTables

Author: RaduBerinde

internal/manifest/l0_sublevels_test.go

@@ -50,7 +50,7 @@ func readManifest(filename string) (*Version, error) {
 			return nil, err
 		}
 		var bve BulkVersionEdit
-		bve.AddedTablesByFileNum = addedByFileNum
+		bve.AllAddedTables = addedByFileNum
 		if err := bve.Accumulate(&ve); err != nil {
 			return nil, err
 		}

internal/manifest/manifest_test.go

@@ -114,7 +114,7 @@ func replayManifest(
 
 	cmp := opts.Comparer
 	var bve manifest.BulkVersionEdit
-	bve.AddedTablesByFileNum = make(map[base.FileNum]*manifest.TableMetadata)
+	bve.AllAddedTables = make(map[base.FileNum]*manifest.TableMetadata)
 	rr := record.NewReader(f, 0 /* logNum */)
 	for {
 		r, err := rr.Next()

internal/manifest/version_edit.go

@@ -956,16 +956,15 @@ type BulkVersionEdit struct {
 	AddedFileBacking   map[base.DiskFileNum]*FileBacking
 	RemovedFileBacking []base.DiskFileNum
 
-	// AddedTablesByFileNum maps file number to table metadata for all added
-	// sstables from accumulated version edits. AddedTablesByFileNum is only
-	// populated if set to non-nil by a caller. It must be set to non-nil when
-	// replaying version edits read from a MANIFEST (as opposed to VersionEdits
-	// constructed in-memory).  While replaying a MANIFEST file,
-	// VersionEdit.DeletedFiles map entries have nil values, because the on-disk
-	// deletion record encodes only the file number. Accumulate uses
-	// AddedTablesByFileNum to correctly populate the BulkVersionEdit's Deleted
-	// field with non-nil *TableMetadata.
-	AddedTablesByFileNum map[base.FileNum]*TableMetadata
+	// AllAddedTables maps table number to table metadata for all added sstables
+	// from accumulated version edits. AllAddedTables is only populated if set to
+	// non-nil by a caller. It must be set to non-nil when replaying version edits
+	// read from a MANIFEST (as opposed to VersionEdits constructed in-memory).
+	// While replaying a MANIFEST file, VersionEdit.DeletedFiles map entries have
+	// nil values, because the on-disk deletion record encodes only the file
+	// number. Accumulate uses AllAddedTables to correctly populate the
+	// BulkVersionEdit's Deleted field with non-nil *TableMetadata.
+	AllAddedTables map[base.FileNum]*TableMetadata
 
 	// MarkedForCompactionCountDiff holds the aggregated count of files
 	// marked for compaction added or removed.
@@ -1042,10 +1041,10 @@ func (b *BulkVersionEdit) Accumulate(ve *VersionEdit) error {
 
 		if m == nil {
 			// m is nil only when replaying a MANIFEST.
-			if b.AddedTablesByFileNum == nil {
+			if b.AllAddedTables == nil {
 				return errors.Errorf("deleted file L%d.%s's metadata is absent and bve.AddedByFileNum is nil", df.Level, df.FileNum)
 			}
-			m = b.AddedTablesByFileNum[df.FileNum]
+			m = b.AllAddedTables[df.FileNum]
 			if m == nil {
 				return base.CorruptionErrorf("pebble: file deleted L%d.%s before it was inserted", df.Level, df.FileNum)
 			}
@@ -1112,8 +1111,8 @@ func (b *BulkVersionEdit) Accumulate(ve *VersionEdit) error {
 			b.AddedTables[nf.Level] = make(map[base.FileNum]*TableMetadata)
 		}
 		b.AddedTables[nf.Level][nf.Meta.FileNum] = nf.Meta
-		if b.AddedTablesByFileNum != nil {
-			b.AddedTablesByFileNum[nf.Meta.FileNum] = nf.Meta
+		if b.AllAddedTables != nil {
+			b.AllAddedTables[nf.Meta.FileNum] = nf.Meta
 		}
 		if nf.Meta.MarkedForCompaction {
 			b.MarkedForCompactionCountDiff++

internal/manifest/version_edit_test.go

@@ -418,10 +418,10 @@ func TestVersionEditApply(t *testing.T) {
 				}
 
 				bve := BulkVersionEdit{}
-				bve.AddedTablesByFileNum = make(map[base.FileNum]*TableMetadata)
+				bve.AllAddedTables = make(map[base.FileNum]*TableMetadata)
 				for _, l := range v.Levels {
 					for f := range l.All() {
-						bve.AddedTablesByFileNum[f.FileNum] = f
+						bve.AllAddedTables[f.FileNum] = f
 					}
 				}
 

replay/replay.go

@@ -712,7 +712,7 @@ func (r *Runner) prepareWorkloadSteps(ctx context.Context) error {
 	v := manifest.NewInitialVersion(r.Opts.Comparer)
 	var previousVersion *manifest.Version
 	var bve manifest.BulkVersionEdit
-	bve.AddedTablesByFileNum = make(map[base.FileNum]*manifest.TableMetadata)
+	bve.AllAddedTables = make(map[base.FileNum]*manifest.TableMetadata)
 
 	for ; idx < len(r.workload.manifests); idx++ {
 		if r.MaxWriteBytes != 0 && cumulativeWriteBytes > r.MaxWriteBytes {
@@ -808,7 +808,7 @@ func (r *Runner) prepareWorkloadSteps(ctx context.Context) error {
 				l0Organizer.PerformUpdate(l0Organizer.PrepareUpdate(&bve, v), v)
 				// AddedTablesByFileNum maps file number to table metadata for all added
 				// sstables from accumulated version edits so we must retain it.
-				bve = manifest.BulkVersionEdit{AddedTablesByFileNum: bve.AddedTablesByFileNum}
+				bve = manifest.BulkVersionEdit{AllAddedTables: bve.AllAddedTables}
 
 				// On the first time through, we set the previous version to the current
 				// version. The rest of the time, we already set it above.

tool/db.go

@@ -697,7 +697,7 @@ func (d *dbT) runProperties(cmd *cobra.Command, args []string) {
 
 		cmp := base.DefaultComparer
 		var bve manifest.BulkVersionEdit
-		bve.AddedTablesByFileNum = make(map[base.FileNum]*manifest.TableMetadata)
+		bve.AllAddedTables = make(map[base.FileNum]*manifest.TableMetadata)
 		rr := record.NewReader(f, 0 /* logNum */)
 		for {
 			r, err := rr.Next()

tool/lsm.go

@@ -351,7 +351,7 @@ func (l *lsmT) coalesceEdits(edits []*manifest.VersionEdit) ([]*manifest.Version
 	}
 
 	be := manifest.BulkVersionEdit{}
-	be.AddedTablesByFileNum = make(map[base.FileNum]*manifest.TableMetadata)
+	be.AllAddedTables = make(map[base.FileNum]*manifest.TableMetadata)
 
 	// Coalesce all edits from [0, l.startEdit) into a BulkVersionEdit.
 	for _, ve := range edits[:l.startEdit] {

tool/manifest.go

@@ -156,7 +156,7 @@ func (m *manifestT) runDump(cmd *cobra.Command, args []string) {
 			fmt.Fprintf(stdout, "%s\n", arg)
 
 			var bve manifest.BulkVersionEdit
-			bve.AddedTablesByFileNum = make(map[base.FileNum]*manifest.TableMetadata)
+			bve.AllAddedTables = make(map[base.FileNum]*manifest.TableMetadata)
 			var comparer *base.Comparer
 			var editIdx int
 			rr := record.NewReader(f, 0 /* logNum */)
@@ -340,7 +340,7 @@ func (m *manifestT) runSummarizeOne(stdout io.Writer, arg string) error {
 		buckets       = map[time.Time]*summaryBucket{}
 		metadatas     = map[base.FileNum]*manifest.TableMetadata{}
 	)
-	bve.AddedTablesByFileNum = make(map[base.FileNum]*manifest.TableMetadata)
+	bve.AllAddedTables = make(map[base.FileNum]*manifest.TableMetadata)
 	rr := record.NewReader(f, 0 /* logNum */)
 	numHistErrors := 0
 	for i := 0; ; i++ {
@@ -616,7 +616,7 @@ func (m *manifestT) runCheck(cmd *cobra.Command, args []string) {
 					break
 				}
 				var bve manifest.BulkVersionEdit
-				bve.AddedTablesByFileNum = addedByFileNum
+				bve.AllAddedTables = addedByFileNum
 				if err := bve.Accumulate(&ve); err != nil {
 					fmt.Fprintf(stderr, "%s\n", err)
 					ok = false

version_set.go

@@ -235,7 +235,7 @@ func (vs *versionSet) load(
 
 	// Read the versionEdits in the manifest file.
 	var bve bulkVersionEdit
-	bve.AddedTablesByFileNum = make(map[base.FileNum]*tableMetadata)
+	bve.AllAddedTables = make(map[base.FileNum]*tableMetadata)
 	manifestFile, err := vs.fs.Open(manifestPath)
 	if err != nil {
 		return errors.Wrapf(err, "pebble: could not open manifest file %q for DB %q",