db: rename FileNum to TableNum in top-level package

Author: RaduBerinde

batch.go

@@ -1179,9 +1179,9 @@ func (b *Batch) LogData(data []byte, _ *WriteOptions) error {
 	return nil
 }
 
-// IngestSST adds the FileNum for an sstable to the batch. The data will only be
+// IngestSST adds the TableNum for an sstable to the batch. The data will only be
 // written to the WAL (not added to memtables or sstables).
-func (b *Batch) ingestSST(fileNum base.FileNum) {
+func (b *Batch) ingestSST(tableNum base.TableNum) {
 	if b.Empty() {
 		b.ingestedSSTBatch = true
 	} else if !b.ingestedSSTBatch {
@@ -1191,7 +1191,7 @@ func (b *Batch) ingestSST(fileNum base.FileNum) {
 
 	origMemTableSize := b.memTableSize
 	var buf [binary.MaxVarintLen64]byte
-	length := binary.PutUvarint(buf[:], uint64(fileNum))
+	length := binary.PutUvarint(buf[:], uint64(tableNum))
 	b.prepareDeferredKeyRecord(length, InternalKeyKindIngestSST)
 	copy(b.deferredOp.Key, buf[:length])
 	// Since IngestSST writes only to the WAL and does not affect the memtable,

batch_test.go

@@ -68,22 +68,22 @@ func testBatch(t *testing.T, size int) {
 		}
 	}
 
-	encodeFileNum := func(n base.FileNum) string {
+	encodeTableNum := func(n base.TableNum) string {
 		return string(binary.AppendUvarint(nil, uint64(n)))
 	}
-	decodeFileNum := func(d []byte) base.FileNum {
+	decodeTableNum := func(d []byte) base.TableNum {
 		val, n := binary.Uvarint(d)
 		if n <= 0 {
 			t.Fatalf("invalid filenum encoding")
 		}
-		return base.FileNum(val)
+		return base.TableNum(val)
 	}
 
 	// RangeKeySet and RangeKeyUnset are untested here because they don't expose
 	// deferred variants. This is a consequence of these keys' more complex
 	// value encodings.
 	testCases := []testCase{
-		{InternalKeyKindIngestSST, encodeFileNum(1), "", 0},
+		{InternalKeyKindIngestSST, encodeTableNum(1), "", 0},
 		{InternalKeyKindSet, "roses", "red", 0},
 		{InternalKeyKindSet, "violets", "blue", 0},
 		{InternalKeyKindDelete, "roses", "", 0},
@@ -131,7 +131,7 @@ func testBatch(t *testing.T, size int) {
 		case InternalKeyKindRangeKeyDelete:
 			_ = b.RangeKeyDelete([]byte(tc.key), []byte(tc.value), nil)
 		case InternalKeyKindIngestSST:
-			b.ingestSST(decodeFileNum([]byte(tc.key)))
+			b.ingestSST(decodeTableNum([]byte(tc.key)))
 		}
 	}
 	verifyTestCases(b, testCases, false /* indexedKindsOnly */)
@@ -175,7 +175,7 @@ func testBatch(t *testing.T, size int) {
 		case InternalKeyKindLogData:
 			_ = b.LogData([]byte(tc.key), nil)
 		case InternalKeyKindIngestSST:
-			b.ingestSST(decodeFileNum([]byte(tc.key)))
+			b.ingestSST(decodeTableNum([]byte(tc.key)))
 		case InternalKeyKindRangeKeyDelete:
 			d := b.RangeKeyDeleteDeferred(len(key), len(value))
 			copy(d.Key, key)

compaction.go

@@ -137,7 +137,7 @@ const (
 	// retained and linked in a new level without being obsoleted.
 	compactionKindMove
 	// compactionKindCopy denotes a copy compaction where the input file is
-	// copied byte-by-byte into a new file with a new FileNum in the output level.
+	// copied byte-by-byte into a new file with a new TableNum in the output level.
 	compactionKindCopy
 	// compactionKindDeleteOnly denotes a compaction that only deletes input
 	// files. It can occur when wide range tombstones completely contain sstables.
@@ -1060,7 +1060,7 @@ type readCompaction struct {
 	// The file associated with the compaction.
 	// If the file no longer belongs in the same
 	// level, then we skip the compaction.
-	fileNum base.FileNum
+	tableNum base.TableNum
 }
 
 func (d *DB) addInProgressCompaction(c *compaction) {
@@ -1345,7 +1345,7 @@ func (d *DB) runIngestFlush(c *compaction) (*manifest.VersionEdit, error) {
 		},
 		v: c.version,
 	}
-	replacedFiles := make(map[base.FileNum][]newTableEntry)
+	replacedTables := make(map[base.TableNum][]newTableEntry)
 	for _, file := range ingestFlushable.files {
 		var fileToSplit *tableMetadata
 		var level int
@@ -1396,14 +1396,14 @@ func (d *DB) runIngestFlush(c *compaction) (*manifest.VersionEdit, error) {
 					return nil, err
 				}
 				newFiles := applyExciseToVersionEdit(ve, m, leftTable, rightTable, layer.Level())
-				replacedFiles[m.TableNum] = newFiles
+				replacedTables[m.TableNum] = newFiles
 				updateLevelMetricsOnExcise(m, layer.Level(), newFiles)
 			}
 		}
 	}
 
 	if len(ingestSplitFiles) > 0 {
-		if err := d.ingestSplit(context.TODO(), ve, updateLevelMetricsOnExcise, ingestSplitFiles, replacedFiles); err != nil {
+		if err := d.ingestSplit(context.TODO(), ve, updateLevelMetricsOnExcise, ingestSplitFiles, replacedTables); err != nil {
 			return nil, err
 		}
 	}
@@ -2451,9 +2451,9 @@ func (d *DB) cleanupVersionEdit(ve *versionEdit) {
 		TableBackings: make([]*manifest.TableBacking, 0, len(ve.NewTables)),
 		BlobFiles:     make([]*manifest.BlobFileMetadata, 0, len(ve.NewBlobFiles)),
 	}
-	deletedFiles := make(map[base.FileNum]struct{})
+	deletedTables := make(map[base.TableNum]struct{})
 	for key := range ve.DeletedTables {
-		deletedFiles[key.FileNum] = struct{}{}
+		deletedTables[key.FileNum] = struct{}{}
 	}
 	for i := range ve.NewBlobFiles {
 		obsoleteFiles.AddBlob(ve.NewBlobFiles[i])
@@ -2470,7 +2470,7 @@ func (d *DB) cleanupVersionEdit(ve *versionEdit) {
 			// We handle backing files separately.
 			continue
 		}
-		if _, ok := deletedFiles[ve.NewTables[i].Meta.TableNum]; ok {
+		if _, ok := deletedTables[ve.NewTables[i].Meta.TableNum]; ok {
 			// This file is being moved in this ve to a different level.
 			// Don't mark it as obsolete.
 			continue
@@ -2578,7 +2578,7 @@ func (d *DB) compact1(c *compaction, errChannel chan error) (err error) {
 	return err
 }
 
-// runCopyCompaction runs a copy compaction where a new FileNum is created that
+// runCopyCompaction runs a copy compaction where a new TableNum is created that
 // is a byte-for-byte copy of the input file or span thereof in some cases. This
 // is used in lieu of a move compaction when a file is being moved across the
 // local/remote storage boundary. It could also be used in lieu of a rewrite
@@ -2647,7 +2647,7 @@ func (d *DB) runCopyCompaction(
 	if inputMeta.HasRangeKeys {
 		newMeta.ExtendRangeKeyBounds(c.cmp, inputMeta.RangeKeyBounds.Smallest(), inputMeta.RangeKeyBounds.Largest())
 	}
-	newMeta.TableNum = d.mu.versions.getNextFileNum()
+	newMeta.TableNum = d.mu.versions.getNextTableNum()
 	if objMeta.IsExternal() {
 		// external -> local/shared copy. File must be virtual.
 		// We will update this size later after we produce the new backing file.

compaction_picker.go

@@ -2003,7 +2003,7 @@ func pickReadTriggeredCompactionHelper(
 	overlapSlice := p.vers.Overlaps(rc.level, base.UserKeyBoundsInclusive(rc.start, rc.end))
 	var fileMatches bool
 	for f := range overlapSlice.All() {
-		if f.TableNum == rc.fileNum {
+		if f.TableNum == rc.tableNum {
 			fileMatches = true
 			break
 		}