From 1378b119fd9a4e6a641e9b11076577dfc51119e6 Mon Sep 17 00:00:00 2001 From: Christian Haudum Date: Wed, 4 Sep 2024 17:42:11 +0200 Subject: [PATCH] fixup! fixup! Introduce Set type for encoding structured metadata fields Signed-off-by: Christian Haudum --- pkg/storage/bloom/v1/builder.go | 6 +++--- pkg/storage/bloom/v1/versioned_builder.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/storage/bloom/v1/builder.go b/pkg/storage/bloom/v1/builder.go index 86f07f3ca7ccd..c6c4a21ca64a5 100644 --- a/pkg/storage/bloom/v1/builder.go +++ b/pkg/storage/bloom/v1/builder.go @@ -301,10 +301,10 @@ func (mb *MergeBuilder) processNextSeries( bytesAdded += bloom.SourceBytesAdded } - // TODO(chaudum): Currently we don't extract the indexed fields when building blooms - // Instead, just use a placeholder for now. + // TODO(chaudum): Use the indexed fields from bloom creation, however, + // currently we still build blooms from log lines. fields := NewSet[Field](1) - fields.Add("__all__") + fields.Add("__line__") done, err := builder.AddSeries(*nextInStore, offsets, fields) if err != nil { diff --git a/pkg/storage/bloom/v1/versioned_builder.go b/pkg/storage/bloom/v1/versioned_builder.go index e7996084a1311..1dd133e210cb0 100644 --- a/pkg/storage/bloom/v1/versioned_builder.go +++ b/pkg/storage/bloom/v1/versioned_builder.go @@ -79,10 +79,10 @@ func (b *V3Builder) BuildFrom(itr iter.Iterator[SeriesWithBlooms]) (uint32, erro return 0, errors.Wrap(err, "iterating blooms") } - // TODO(chaudum): Currently we don't extract the indexed fields when building blooms - // Instead, just use a placeholder for now. + // TODO(chaudum): Use the indexed fields from bloom creation, however, + // currently we still build blooms from log lines. fields := NewSet[Field](1) - fields.Add("__all__") + fields.Add("__line__") blockFull, err := b.AddSeries(*at.Series, offsets, fields) if err != nil {