Improve filtered index cache filtering (thanos-io#6955)

* improve filtered index cache filtering Signed-off-by: Ben Ye <[email protected]> * make inline Signed-off-by: Ben Ye <[email protected]> --------- Signed-off-by: Ben Ye <[email protected]>
yeya24 · Dec 4, 2023 · 28407d6 · 28407d6
1 parent 42f4de4
commit 28407d6
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/pkg/store/cache/filter_cache.go b/pkg/store/cache/filter_cache.go
@@ -14,45 +14,48 @@ import (
 )
 
 type FilteredIndexCache struct {
-	cache        IndexCache
-	enabledItems []string
+	cache                   IndexCache
+	postingsEnabled         bool
+	seriesEnabled           bool
+	expandedPostingsEnabled bool
 }
 
 // NewFilteredIndexCache creates a filtered index cache based on enabled items.
 func NewFilteredIndexCache(cache IndexCache, enabledItems []string) *FilteredIndexCache {
-	return &FilteredIndexCache{
-		cache:        cache,
-		enabledItems: enabledItems,
-	}
+	c := &FilteredIndexCache{cache: cache}
+	c.postingsEnabled = len(enabledItems) == 0 || slices.Contains(enabledItems, CacheTypePostings)
+	c.expandedPostingsEnabled = len(enabledItems) == 0 || slices.Contains(enabledItems, CacheTypeExpandedPostings)
+	c.seriesEnabled = len(enabledItems) == 0 || slices.Contains(enabledItems, CacheTypeSeries)
+	return c
 }
 
 // StorePostings sets the postings identified by the ulid and label to the value v,
 // if the postings already exists in the cache it is not mutated.
 func (c *FilteredIndexCache) StorePostings(blockID ulid.ULID, l labels.Label, v []byte, tenant string) {
-	if len(c.enabledItems) == 0 || slices.Contains(c.enabledItems, CacheTypePostings) {
+	if c.postingsEnabled {
 		c.cache.StorePostings(blockID, l, v, tenant)
 	}
 }
 
 // FetchMultiPostings fetches multiple postings - each identified by a label -
 // and returns a map containing cache hits, along with a list of missing keys.
 func (c *FilteredIndexCache) FetchMultiPostings(ctx context.Context, blockID ulid.ULID, keys []labels.Label, tenant string) (hits map[labels.Label][]byte, misses []labels.Label) {
-	if len(c.enabledItems) == 0 || slices.Contains(c.enabledItems, CacheTypePostings) {
+	if c.postingsEnabled {
 		return c.cache.FetchMultiPostings(ctx, blockID, keys, tenant)
 	}
 	return nil, keys
 }
 
 // StoreExpandedPostings stores expanded postings for a set of label matchers.
 func (c *FilteredIndexCache) StoreExpandedPostings(blockID ulid.ULID, matchers []*labels.Matcher, v []byte, tenant string) {
-	if len(c.enabledItems) == 0 || slices.Contains(c.enabledItems, CacheTypeExpandedPostings) {
+	if c.expandedPostingsEnabled {
 		c.cache.StoreExpandedPostings(blockID, matchers, v, tenant)
 	}
 }
 
 // FetchExpandedPostings fetches expanded postings and returns cached data and a boolean value representing whether it is a cache hit or not.
 func (c *FilteredIndexCache) FetchExpandedPostings(ctx context.Context, blockID ulid.ULID, matchers []*labels.Matcher, tenant string) ([]byte, bool) {
-	if len(c.enabledItems) == 0 || slices.Contains(c.enabledItems, CacheTypeExpandedPostings) {
+	if c.expandedPostingsEnabled {
 		return c.cache.FetchExpandedPostings(ctx, blockID, matchers, tenant)
 	}
 	return nil, false
@@ -61,15 +64,15 @@ func (c *FilteredIndexCache) FetchExpandedPostings(ctx context.Context, blockID
 // StoreSeries sets the series identified by the ulid and id to the value v,
 // if the series already exists in the cache it is not mutated.
 func (c *FilteredIndexCache) StoreSeries(blockID ulid.ULID, id storage.SeriesRef, v []byte, tenant string) {
-	if len(c.enabledItems) == 0 || slices.Contains(c.enabledItems, CacheTypeSeries) {
+	if c.seriesEnabled {
 		c.cache.StoreSeries(blockID, id, v, tenant)
 	}
 }
 
 // FetchMultiSeries fetches multiple series - each identified by ID - from the cache
 // and returns a map containing cache hits, along with a list of missing IDs.
 func (c *FilteredIndexCache) FetchMultiSeries(ctx context.Context, blockID ulid.ULID, ids []storage.SeriesRef, tenant string) (hits map[storage.SeriesRef][]byte, misses []storage.SeriesRef) {
-	if len(c.enabledItems) == 0 || slices.Contains(c.enabledItems, CacheTypeSeries) {
+	if c.seriesEnabled {
 		return c.cache.FetchMultiSeries(ctx, blockID, ids, tenant)
 	}
 	return nil, ids