sstable: save UserProperties from Properties on sstable reader

To support removing the `Properties` field from the reader, we should save at
least the UserProperties to support checking the intersection of filters when
creating RangeKey and Point iterators.

Part of: #4383

Author: xinhaoz

file_cache.go

@@ -511,7 +511,7 @@ func checkAndIntersectFilters(
 		filterer, err = sstable.IntersectsTable(
 			blockPropertyFilters,
 			boundLimitedFilter,
-			r.Properties.UserProperties,
+			r.UserProperties,
 			syntheticSuffix,
 		)
 		// NB: IntersectsTable will return a nil filterer if the table-level

metamorphic/options_test.go

@@ -217,7 +217,7 @@ func TestBlockPropertiesParse(t *testing.T) {
 			if err != nil {
 				return errors.CombineErrors(err, readable.Close())
 			}
-			_, ok := r.Properties.UserProperties[opts.Opts.BlockPropertyCollectors[0]().Name()]
+			_, ok := r.UserProperties[opts.Opts.BlockPropertyCollectors[0]().Name()]
 			foundTableBlockProperty = foundTableBlockProperty || ok
 			return r.Close()
 		}))

sstable/block_property_test.go

@@ -892,7 +892,7 @@ func TestBlockProperties(t *testing.T) {
 			buf.WriteString("points: ")
 			if len(points) > 0 {
 				f = newBlockPropertiesFilterer(points, nil, syntheticSuffix)
-				ok, err := f.intersectsUserPropsAndFinishInit(r.Properties.UserProperties)
+				ok, err := f.intersectsUserPropsAndFinishInit(r.UserProperties)
 				if err != nil {
 					return err.Error()
 				}
@@ -949,7 +949,7 @@ func TestBlockProperties(t *testing.T) {
 			buf.WriteString("ranges: ")
 			if len(ranges) > 0 {
 				f := newBlockPropertiesFilterer(ranges, nil, nil)
-				ok, err := f.intersectsUserPropsAndFinishInit(r.Properties.UserProperties)
+				ok, err := f.intersectsUserPropsAndFinishInit(r.UserProperties)
 				if err != nil {
 					return err.Error()
 				}
@@ -980,7 +980,7 @@ func TestBlockProperties(t *testing.T) {
 				}
 			}
 			filterer := newBlockPropertiesFilterer(filters, nil, nil)
-			ok, err := filterer.intersectsUserPropsAndFinishInit(r.Properties.UserProperties)
+			ok, err := filterer.intersectsUserPropsAndFinishInit(r.UserProperties)
 			if err != nil {
 				return err.Error()
 			} else if !ok {
@@ -1070,7 +1070,7 @@ func TestBlockProperties_BoundLimited(t *testing.T) {
 			}
 
 			filterer := newBlockPropertiesFilterer(nil, &filter, syntheticSuffix)
-			ok, err := filterer.intersectsUserPropsAndFinishInit(r.Properties.UserProperties)
+			ok, err := filterer.intersectsUserPropsAndFinishInit(r.UserProperties)
 			if err != nil {
 				return err.Error()
 			} else if !ok {
@@ -1193,7 +1193,7 @@ func parseIntervalFilter(cmd datadriven.CmdArg) (BlockPropertyFilter, error) {
 
 func runCollectorsCmd(r *Reader, td *datadriven.TestData) string {
 	var lines []string
-	for k, v := range r.Properties.UserProperties {
+	for k, v := range r.UserProperties {
 		lines = append(lines, fmt.Sprintf("%d: %s", v[0], k))
 	}
 	linesSorted := sort.StringSlice(lines)
@@ -1203,7 +1203,7 @@ func runCollectorsCmd(r *Reader, td *datadriven.TestData) string {
 
 func runTablePropsCmd(r *Reader, td *datadriven.TestData) string {
 	var lines []string
-	for _, val := range r.Properties.UserProperties {
+	for _, val := range r.UserProperties {
 		id := shortID(val[0])
 		i, err := decodeBlockInterval([]byte(val[1:]))
 		if err != nil {

sstable/reader.go

@@ -65,9 +65,10 @@ type Reader struct {
 	metaindexBH  block.Handle
 	footerBH     block.Handle
 
-	Properties  Properties
-	tableFormat TableFormat
-	Attributes  Attributes
+	Properties     Properties
+	tableFormat    TableFormat
+	Attributes     Attributes
+	UserProperties map[string]string
 }
 
 type ReadEnv struct {
@@ -486,6 +487,7 @@ func (r *Reader) readMetaindex(
 		if err != nil {
 			return err
 		}
+		r.UserProperties = r.Properties.UserProperties
 	} else {
 		return errors.New("did not read any value for the properties block in the meta index")
 	}
@@ -549,11 +551,11 @@ var propertiesBlockBufPools = sync.Pool{
 	},
 }
 
-// ReadPropertiesBlock reads the properties block from the table.
-// We always read the properties block into a buffer pool instead
-// of the block cache.
+// ReadPropertiesBlock reads the properties block
+// from the table. We always read the properties block into a buffer pool
+// instead of the block cache.
 func (r *Reader) ReadPropertiesBlock(
-	ctx context.Context, bufferPool *block.BufferPool, deniedUserProperties map[string]struct{},
+	ctx context.Context, bufferPool *block.BufferPool,
 ) (Properties, error) {
 	return r.readPropertiesBlockInternal(ctx, bufferPool, noReadHandle)
 }

sstable/reader_test.go

@@ -778,7 +778,7 @@ func runTestReader(t *testing.T, o WriterOptions, dir string, r *Reader, printVa
 				if len(bpfs) > 0 {
 					filterer = newBlockPropertiesFilterer(bpfs, nil, nil)
 					intersects, err :=
-						filterer.intersectsUserPropsAndFinishInit(r.Properties.UserProperties)
+						filterer.intersectsUserPropsAndFinishInit(r.UserProperties)
 					if err != nil {
 						return err.Error()
 					}
@@ -2512,7 +2512,7 @@ func BenchmarkIteratorScanObsolete(b *testing.B) {
 									filterer = newBlockPropertiesFilterer(
 										[]BlockPropertyFilter{obsoleteKeyBlockPropertyFilter{}}, nil, nil)
 									intersects, err :=
-										filterer.intersectsUserPropsAndFinishInit(r.Properties.UserProperties)
+										filterer.intersectsUserPropsAndFinishInit(r.UserProperties)
 									if err != nil {
 										b.Fatalf("%s", err.Error())
 									}

sstable/suffix_rewriter.go

@@ -270,7 +270,7 @@ func getShortIDs(
 		shortIDs[i] = invalidShortID
 	}
 	for i, p := range collectors {
-		prop, ok := r.Properties.UserProperties[p.Name()]
+		prop, ok := r.UserProperties[p.Name()]
 		if !ok {
 			return nil, 0, errors.Errorf("sstable does not contain property %s", p.Name())
 		}

sstable/suffix_rewriter_test.go

@@ -112,7 +112,7 @@ func TestRewriteSuffixProps(t *testing.T) {
 						defer rRewritten.Close()
 
 						foundValues := make(map[string][]byte)
-						for k, v := range rRewritten.Properties.UserProperties {
+						for k, v := range rRewritten.UserProperties {
 							if k == "obsolete-key" {
 								continue
 							}

testdata/ingest

@@ -55,7 +55,7 @@ Local tables size: 569B
 Compression types: snappy: 1
 Table stats: all loaded
 Block cache: 3 entries (1.1KB)  hit rate: 18.2%
-Table cache: 1 entries (832B)  hit rate: 50.0%
+Table cache: 1 entries (840B)  hit rate: 50.0%
 Range key sets: 0  Tombstones: 0  Total missized tombstones encountered: 0
 Snapshots: 0  earliest seq num: 0
 Table iters: 0

testdata/metrics

@@ -78,7 +78,7 @@ Local tables size: 755B
 Compression types: snappy: 1
 Table stats: all loaded
 Block cache: 2 entries (795B)  hit rate: 0.0%
-Table cache: 1 entries (832B)  hit rate: 0.0%
+Table cache: 1 entries (840B)  hit rate: 0.0%
 Range key sets: 0  Tombstones: 0  Total missized tombstones encountered: 0
 Snapshots: 0  earliest seq num: 0
 Table iters: 1
@@ -236,7 +236,7 @@ Local tables size: 1.5KB
 Compression types: snappy: 2
 Table stats: all loaded
 Block cache: 2 entries (795B)  hit rate: 33.3%
-Table cache: 1 entries (832B)  hit rate: 66.7%
+Table cache: 1 entries (840B)  hit rate: 66.7%
 Range key sets: 0  Tombstones: 0  Total missized tombstones encountered: 0
 Snapshots: 0  earliest seq num: 0
 Table iters: 1

tool/db.go

@@ -1014,7 +1014,7 @@ func (d *dbT) addProps(objProvider objstorage.Provider, m *manifest.TableMetadat
 		return errors.CombineErrors(err, f.Close())
 	}
 
-	properties, err := r.ReadPropertiesBlock(context.TODO(), nil /* buffer pool */, opts.DeniedUserProperties)
+	properties, err := r.ReadPropertiesBlock(context.TODO(), nil /* buffer pool */)
 	if err != nil {
 		return errors.CombineErrors(err, r.Close())
 	}

tool/sstable.go

@@ -319,13 +319,14 @@ func (s *sstableT) runProperties(cmd *cobra.Command, args []string) {
 		fmt.Fprintf(tw, "  options\t%s\n", props.CompressionOptions)
 		fmt.Fprintf(tw, "user properties\t\n")
 		fmt.Fprintf(tw, "  collectors\t%s\n", props.PropertyCollectorNames)
-		keys := make([]string, 0, len(props.UserProperties))
-		for key := range props.UserProperties {
+		// Read UserProperties directly from reader.
+		keys := make([]string, 0, len(r.UserProperties))
+		for key := range r.UserProperties {
 			keys = append(keys, key)
 		}
 		slices.Sort(keys)
 		for _, key := range keys {
-			fmt.Fprintf(tw, "  %s\t%s\n", key, props.UserProperties[key])
+			fmt.Fprintf(tw, "  %s\t%s\n", key, r.UserProperties[key])
 		}
 		_ = tw.Flush()
 	})
@@ -584,8 +585,7 @@ func (s *sstableT) foreachSstable(
 		}
 		defer func() { _ = r.Close() }()
 
-		deniedUserProps := s.opts.MakeReaderOptions().DeniedUserProperties
-		props, err := r.ReadPropertiesBlock(context.Background(), nil /* buffer pool */, deniedUserProps)
+		props, err := r.ReadPropertiesBlock(context.Background(), nil /* buffer pool */)
 		if err != nil {
 			fmt.Fprintf(stderr, "%s\n", err)
 			return