virtual: move IsSharedIngested to ReadEnv

We don't know the value of this flag just from the TableMetadata,
which precludes pre-initializing `VirtualReaderParams`.

Author: RaduBerinde

data_test.go

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

file_cache.go

@@ -315,8 +315,9 @@ func createReader(v *fileCacheValue, file *tableMetadata) (*sstable.Reader, ssta
 	r := v.mustSSTableReader()
 	env := sstable.ReadEnv{}
 	if file.Virtual != nil {
-		file.InitVirtual(v.isShared)
+		file.InitVirtual()
 		env.Virtual = file.Virtual
+		env.IsSharedIngested = v.isShared && file.SyntheticSeqNum() != 0
 	}
 	return r, env
 }
@@ -339,8 +340,9 @@ func (h *fileCacheHandle) withReader(
 
 	r := v.mustSSTableReader()
 	if meta.Virtual != nil {
-		meta.InitVirtual(v.isShared)
+		meta.InitVirtual()
 		env.Virtual = meta.Virtual
+		env.IsSharedIngested = v.isShared && meta.SyntheticSeqNum() != 0
 	}
 
 	return fn(r, env)
@@ -526,6 +528,7 @@ func (h *fileCacheHandle) newIters(
 	v := vRef.Value()
 	r, env := createReader(v, file)
 	internalOpts.readEnv.Virtual = env.Virtual
+	internalOpts.readEnv.IsSharedIngested = env.IsSharedIngested
 
 	var iters iterSet
 	if kinds.RangeKey() && file.HasRangeKeys {

internal/manifest/version.go

@@ -350,11 +350,10 @@ type TableMetadata struct {
 	SyntheticPrefixAndSuffix sstable.SyntheticPrefixAndSuffix
 }
 
-func (m *TableMetadata) InitVirtual(isShared bool) {
+func (m *TableMetadata) InitVirtual() {
 	m.Virtual.Lower = m.Smallest
 	m.Virtual.Upper = m.Largest
 	m.Virtual.FileNum = m.FileNum
-	m.Virtual.IsSharedIngested = isShared && m.SyntheticSeqNum() != 0
 }
 
 // Ref increments the table's ref count. If this is the table's first reference,

sstable/reader.go

@@ -69,7 +69,10 @@ type Reader struct {
 
 type ReadEnv struct {
 	Virtual *virtual.VirtualReaderParams
-	Block   block.ReadEnv
+	// IsSharedIngested is true if this is a shared table that was ingested. Can
+	// only be set when Virtual is non-nil.
+	IsSharedIngested bool
+	Block            block.ReadEnv
 }
 
 var NoReadEnv = ReadEnv{}
@@ -188,7 +191,7 @@ func (r *Reader) NewCompactionIter(
 func (r *Reader) newCompactionIter(
 	transforms IterTransforms, env ReadEnv, rp valblk.ReaderProvider, blobContext TableBlobContext,
 ) (Iterator, error) {
-	if env.Virtual != nil && env.Virtual.IsSharedIngested {
+	if env.IsSharedIngested {
 		transforms.HideObsoletePoints = true
 	}
 	ctx := context.Background()
@@ -272,7 +275,7 @@ func (r *Reader) NewRawRangeKeyIter(
 	ctx context.Context, transforms FragmentIterTransforms, env ReadEnv,
 ) (iter keyspan.FragmentIterator, err error) {
 	syntheticSeqNum := transforms.SyntheticSeqNum
-	if env.Virtual != nil && env.Virtual.IsSharedIngested {
+	if env.IsSharedIngested {
 		// Don't pass a synthetic sequence number for shared ingested sstables. We
 		// need to know the materialized sequence numbers, and we will set up the
 		// appropriate sequence number substitution below.
@@ -302,7 +305,7 @@ func (r *Reader) NewRawRangeKeyIter(
 		//
 		// TODO(bilal): Avoid these allocations by hoisting the transformer and
 		// transform iter up.
-		if env.Virtual.IsSharedIngested {
+		if env.IsSharedIngested {
 			transform := &rangekey.ForeignSSTTransformer{
 				Equal:  r.Comparer.Equal,
 				SeqNum: base.SeqNum(syntheticSeqNum),

sstable/virtual/virtual_reader_params.go

@@ -4,10 +4,9 @@ import "github.com/cockroachdb/pebble/internal/base"
 
 // VirtualReaderParams are the parameters necessary for a reader to read virtual sstables.
 type VirtualReaderParams struct {
-	Lower            base.InternalKey
-	Upper            base.InternalKey
-	FileNum          base.FileNum
-	IsSharedIngested bool
+	Lower   base.InternalKey
+	Upper   base.InternalKey
+	FileNum base.FileNum
 }
 
 // Constrain bounds will narrow the start, end bounds if they do not fit within