@@ -6,9 +6,11 @@ package pebble
66
77import (
88 "bytes"
9+ stdcmp "cmp"
910 "context"
1011 "fmt"
1112 "iter"
13+ "maps"
1214 "math"
1315 "runtime/pprof"
1416 "slices"
@@ -331,6 +333,8 @@ type tableCompaction struct {
331333
332334 tableFormat sstable.TableFormat
333335 objCreateOpts objstorage.CreateOptions
336+
337+ annotations []string
334338}
335339
336340// Assert that tableCompaction implements the compaction interface.
@@ -2681,6 +2685,7 @@ func (d *DB) compact1(jobID JobID, c *tableCompaction) (err error) {
26812685
26822686 ve , stats , err := d .runCompaction (jobID , c )
26832687
2688+ info .Annotations = append (info .Annotations , c .annotations ... )
26842689 info .Duration = d .timeNow ().Sub (startTime )
26852690 if err == nil {
26862691 validateVersionEdit (ve , d .opts .Comparer .ValidateKey , d .opts .Comparer .FormatKey , d .opts .Logger )
@@ -3114,6 +3119,13 @@ func (d *DB) runDeleteOnlyCompaction(
31143119 }
31153120 return false
31163121 })
3122+ sort .Slice (ve .NewTables , func (i , j int ) bool {
3123+ return ve .NewTables [i ].Meta .TableNum < ve .NewTables [j ].Meta .TableNum
3124+ })
3125+ deletedTableEntries := slices .Collect (maps .Keys (ve .DeletedTables ))
3126+ slices .SortFunc (deletedTableEntries , func (a , b manifest.DeletedTableEntry ) int {
3127+ return stdcmp .Compare (a .FileNum , b .FileNum )
3128+ })
31173129 // Remove any entries from CreatedBackingTables that are not used in any
31183130 // NewFiles.
31193131 usedBackingFiles := make (map [base.DiskFileNum ]struct {})
@@ -3126,6 +3138,22 @@ func (d *DB) runDeleteOnlyCompaction(
31263138 _ , used := usedBackingFiles [b .DiskFileNum ]
31273139 return ! used
31283140 })
3141+
3142+ // Iterate through the deleted tables and new tables to annotate excised tables.
3143+ // If a new table is virtual and the base.DiskFileNum is the same as a deleted table, then
3144+ // our deleted table was excised.
3145+ for _ , table := range deletedTableEntries {
3146+ for _ , newEntry := range ve .NewTables {
3147+ if newEntry .Meta .Virtual &&
3148+ newEntry .Meta .TableBacking .DiskFileNum == ve .DeletedTables [table ].TableBacking .DiskFileNum {
3149+ c .annotations = append (c .annotations ,
3150+ fmt .Sprintf ("(excised: %s)" , ve .DeletedTables [table ].TableNum ))
3151+ break
3152+ }
3153+ }
3154+
3155+ }
3156+
31293157 // Refresh the disk available statistic whenever a compaction/flush
31303158 // completes, before re-acquiring the mutex.
31313159 d .calculateDiskAvailableBytes ()
0 commit comments