bloom controller wiring

Signed-off-by: Owen Diehl <[email protected]>
grafana · Jan 31, 2024 · 88e24f1 · 88e24f1
1 parent 8339db0
commit 88e24f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkg/bloomcompactor/v2_meta.go b/pkg/bloomcompactor/v2_meta.go
@@ -131,6 +131,6 @@ type MetaStore interface {
 
 type BlockStore interface {
 	// TODO(owen-d): flesh out|integrate against bloomshipper.Client
-	GetBlocks([]BlockRef) ([]interface{}, error)
+	GetBlocks([]BlockRef) ([]*v1.Block, error)
 	PutBlock(interface{}) error
 }
diff --git a/pkg/bloomcompactor/v2controller.go b/pkg/bloomcompactor/v2controller.go
@@ -159,13 +159,17 @@ func (s *SimpleBloomController) do(ctx context.Context) error {
 
 func (s *SimpleBloomController) loadWorkForGap(id tsdb.Identifier, gap gapWithBlocks) (v1.CloseableIterator[*v1.Series], []*v1.Block, error) {
 	// load a series iterator for the gap
-	_, err := s.tsdbStore.LoadTSDB(id, gap.bounds)
+	seriesItr, err := s.tsdbStore.LoadTSDB(id, gap.bounds)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "failed to load tsdb")
 	}
 
-	// TODO(owen-d): finish
-	panic("not implemented")
+	blocks, err := s.blockStore.GetBlocks(gap.blocks)
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "failed to get blocks")
+	}
+
+	return seriesItr, blocks, nil
 }
 
 type gapWithBlocks struct {