Add NewBlockOptions constructor (#10955)

Adds a `NewBlockOptions()` constructor plus a quick fix for a missed err check.
grafana · Oct 19, 2023 · cbc0df3 · cbc0df3
1 parent 2abb472
commit cbc0df3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/pkg/storage/bloom/v1/builder.go b/pkg/storage/bloom/v1/builder.go
@@ -28,6 +28,16 @@ type BlockBuilder struct {
 	blooms *BloomBlockBuilder
 }
 
+func NewBlockOptions() BlockOptions {
+	return BlockOptions{
+		schema: Schema{
+			version: byte(1),
+		},
+		SeriesPageSize: 100,
+		BloomPageSize:  10 << 10, // 0.01MB
+	}
+}
+
 func NewBlockBuilder(opts BlockOptions, writer BlockWriter) (*BlockBuilder, error) {
 	index, err := writer.Index()
 	if err != nil {

diff --git a/pkg/storage/bloom/v1/index_querier.go b/pkg/storage/bloom/v1/index_querier.go
@@ -42,6 +42,9 @@ func (it *LazySeriesIter) ensureInit() {
 // Seek returns an iterator over the pages where the first fingerprint is >= fp
 func (it *LazySeriesIter) Seek(fp model.Fingerprint) error {
 	it.ensureInit()
+	if it.err != nil {
+		return it.err
+	}
 
 	// first potentially relevant page
 	desiredPage := sort.Search(len(it.b.index.pageHeaders), func(i int) bool {