virtual: remove Size and BackingSize from VirtualReaderParams

Author: RaduBerinde

data_test.go

@@ -1291,7 +1291,7 @@ func runSSTablePropertiesCmd(t *testing.T, td *datadriven.TestData, d *DB) strin
 	if m != nil && m.Virtual != nil {
 		m.InitVirtual(false /* isShared */)
 		env.Virtual = m.Virtual
-		scaledProps := r.Properties.GetScaledProperties(env.Virtual.BackingSize, env.Virtual.Size)
+		scaledProps := r.Properties.GetScaledProperties(m.FileBacking.Size, m.Size)
 		props = scaledProps.String()
 	}
 	if len(td.Input) == 0 {

internal/manifest/version.go

@@ -354,9 +354,7 @@ func (m *TableMetadata) InitVirtual(isShared bool) {
 	m.Virtual.Lower = m.Smallest
 	m.Virtual.Upper = m.Largest
 	m.Virtual.FileNum = m.FileNum
-	m.Virtual.Size = m.Size
 	m.Virtual.IsSharedIngested = isShared && m.SyntheticSeqNum() != 0
-	m.Virtual.BackingSize = m.FileBacking.Size
 }
 
 // Ref increments the table's ref count. If this is the table's first reference,

sstable/reader_test.go

@@ -137,13 +137,13 @@ func runVirtualReaderTest(t *testing.T, path string, blockSize, indexBlockSize i
 		}
 	}()
 
-	formatVirtualReader := func(r *Reader, showProps bool, env ReadEnv) string {
+	formatVirtualReader := func(r *Reader, showProps bool, env ReadEnv, backingSize, tableSize uint64) string {
 		var b bytes.Buffer
 		fmt.Fprintf(&b, "bounds:  [%s-%s]\n", env.Virtual.Lower, env.Virtual.Upper)
 		if showProps {
 			fmt.Fprintf(&b, "filenum: %s\n", env.Virtual.FileNum.String())
 			fmt.Fprintf(&b, "props:\n")
-			p := r.Properties.GetScaledProperties(env.Virtual.BackingSize, env.Virtual.Size)
+			p := r.Properties.GetScaledProperties(backingSize, tableSize)
 			for _, line := range strings.Split(strings.TrimSpace(p.String()), "\n") {
 				fmt.Fprintf(&b, "  %s\n", line)
 			}
@@ -205,15 +205,14 @@ func runVirtualReaderTest(t *testing.T, path string, blockSize, indexBlockSize i
 			}
 
 			params.FileNum = nextFileNum()
-			params.BackingSize = wMeta.Size
 			env.Virtual = &params
 
 			var err error
-			params.Size, err = r.EstimateDiskUsage(params.Lower.UserKey, params.Upper.UserKey, env)
+			tableSize, err := r.EstimateDiskUsage(params.Lower.UserKey, params.Upper.UserKey, env)
 			if err != nil {
 				return err.Error()
 			}
-			return formatVirtualReader(r, showProps, env)
+			return formatVirtualReader(r, showProps, env, wMeta.Size, tableSize)
 
 		case "compaction-iter":
 			// Creates a compaction iterator from the virtual reader, and then

sstable/virtual/virtual_reader_params.go

@@ -8,11 +8,6 @@ type VirtualReaderParams struct {
 	Upper            base.InternalKey
 	FileNum          base.FileNum
 	IsSharedIngested bool
-	// Size is an estimate of the size of the [Lower, Upper) section of the table.
-	Size uint64
-	// BackingSize is the total size of the backing table. The ratio between Size
-	// and BackingSize is used to estimate statistics.
-	BackingSize uint64
 }
 
 // Constrain bounds will narrow the start, end bounds if they do not fit within

table_stats.go

@@ -308,7 +308,7 @@ func (d *DB) loadTableStats(
 		context.TODO(), block.NoReadEnv, meta, func(r *sstable.Reader, env sstable.ReadEnv) (err error) {
 			props := r.Properties.CommonProperties
 			if meta.Virtual != nil {
-				props = r.Properties.GetScaledProperties(env.Virtual.BackingSize, env.Virtual.Size)
+				props = r.Properties.GetScaledProperties(meta.FileBacking.Size, meta.Size)
 			}
 			stats.NumEntries = props.NumEntries
 			stats.NumDeletions = props.NumDeletions