From d2ecea721d49dc582157046ae437b81050dd56d7 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Fri, 26 Apr 2024 10:49:22 +0100 Subject: [PATCH 1/2] Fix lint error Signed-off-by: Michel Hollands --- pkg/bloomgateway/client.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/bloomgateway/client.go b/pkg/bloomgateway/client.go index 0ef6f498a59cf..8169bc9ec0883 100644 --- a/pkg/bloomgateway/client.go +++ b/pkg/bloomgateway/client.go @@ -201,7 +201,7 @@ func (c *GatewayClient) Close() { } // FilterChunkRefs implements Client -func (c *GatewayClient) FilterChunks(ctx context.Context, tenant string, interval bloomshipper.Interval, blocks []blockWithSeries, plan plan.QueryPlan) ([]*logproto.GroupedChunkRefs, error) { +func (c *GatewayClient) FilterChunks(ctx context.Context, _ string, interval bloomshipper.Interval, blocks []blockWithSeries, plan plan.QueryPlan) ([]*logproto.GroupedChunkRefs, error) { // no block and therefore no series with chunks if len(blocks) == 0 { return nil, nil @@ -285,7 +285,7 @@ func (c *GatewayClient) FilterChunks(ctx context.Context, tenant string, interva return mergeSeries(results, buf) } -// mergeSeries combines respones from multiple FilterChunkRefs calls and deduplicates +// mergeSeries combines response from multiple FilterChunkRefs calls and deduplicates // chunks from series that appear in multiple responses. // To avoid allocations, an optional slice can be passed as second argument. func mergeSeries(input [][]*logproto.GroupedChunkRefs, buf []*logproto.GroupedChunkRefs) ([]*logproto.GroupedChunkRefs, error) { From 6764042b67f193ec86ad671c8cfb35db70036181 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Fri, 26 Apr 2024 10:50:38 +0100 Subject: [PATCH 2/2] Fix typo Signed-off-by: Michel Hollands --- pkg/bloomgateway/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/bloomgateway/client.go b/pkg/bloomgateway/client.go index 8169bc9ec0883..a17b9ec0e8c63 100644 --- a/pkg/bloomgateway/client.go +++ b/pkg/bloomgateway/client.go @@ -285,7 +285,7 @@ func (c *GatewayClient) FilterChunks(ctx context.Context, _ string, interval blo return mergeSeries(results, buf) } -// mergeSeries combines response from multiple FilterChunkRefs calls and deduplicates +// mergeSeries combines responses from multiple FilterChunkRefs calls and deduplicates // chunks from series that appear in multiple responses. // To avoid allocations, an optional slice can be passed as second argument. func mergeSeries(input [][]*logproto.GroupedChunkRefs, buf []*logproto.GroupedChunkRefs) ([]*logproto.GroupedChunkRefs, error) {