From df03f186b15bc775ef4534a91f14eaa4c71184eb Mon Sep 17 00:00:00 2001 From: Ashwanth Date: Mon, 21 Jul 2025 12:10:08 +0530 Subject: [PATCH] chore: fix failing lint on main (#18511) --- pkg/compactor/deletion/delete_request_batch.go | 4 +--- pkg/compactor/deletion/job_builder.go | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/compactor/deletion/delete_request_batch.go b/pkg/compactor/deletion/delete_request_batch.go index d5a012f60d..1a0e607b48 100644 --- a/pkg/compactor/deletion/delete_request_batch.go +++ b/pkg/compactor/deletion/delete_request_batch.go @@ -168,9 +168,7 @@ func (b *deleteRequestBatch) getAllRequestsForUser(userID string) []*DeleteReque func (b *deleteRequestBatch) getAllRequests() []*DeleteRequest { requests := make([]*DeleteRequest, 0, b.count) for _, ur := range b.deleteRequestsToProcess { - for _, request := range ur.requests { - requests = append(requests, request) - } + requests = append(requests, ur.requests...) } return requests diff --git a/pkg/compactor/deletion/job_builder.go b/pkg/compactor/deletion/job_builder.go index fdfb478935..d2c2c452d3 100644 --- a/pkg/compactor/deletion/job_builder.go +++ b/pkg/compactor/deletion/job_builder.go @@ -168,13 +168,13 @@ func (b *JobBuilder) processManifest(ctx context.Context, manifest *manifest, ma b.currSegmentStorageUpdates.reset(segment.TableName, segment.UserID) // Process each chunks group (same deletion query) - for i, group := range segment.ChunksGroups { + for _, group := range segment.ChunksGroups { // Check if we should stop processing this manifest if ctx.Err() != nil { return ctx.Err() } - if err := b.createJobsForChunksGroup(ctx, segment.TableName, segment.UserID, fmt.Sprintf("%d", i), group, jobsChan); err != nil { + if err := b.createJobsForChunksGroup(ctx, segment.TableName, segment.UserID, group, jobsChan); err != nil { return err } } @@ -282,7 +282,7 @@ func (b *JobBuilder) readManifest(ctx context.Context, manifestPath string) (*ma return &m, nil } -func (b *JobBuilder) createJobsForChunksGroup(ctx context.Context, tableName, userID, groupID string, group ChunksGroup, jobsChan chan<- *grpc.Job) error { +func (b *JobBuilder) createJobsForChunksGroup(ctx context.Context, tableName, userID string, group ChunksGroup, jobsChan chan<- *grpc.Job) error { for labels, chunks := range group.Chunks { // Split chunks into groups of maxChunksPerJob for i := 0; i < len(chunks); i += maxChunksPerJob {