Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix bloom deleter PR after merge #13167

Merged

Conversation

salvacorts
Copy link
Contributor

@salvacorts salvacorts commented Jun 7, 2024

Fixes #13153. Reimplemented outdatedMetas as it's currently implemented in the bloomcompactor pkg:

func outdatedMetas(metas []bloomshipper.Meta) (outdated []bloomshipper.Meta, err error) {

nit: I'm removing the err returned by outdatedMetas since it's always nil.

@salvacorts salvacorts marked this pull request as ready for review June 7, 2024 09:33
@salvacorts salvacorts requested a review from a team as a code owner June 7, 2024 09:33
Copy link
Contributor

@grobinson-grafana grobinson-grafana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@@ -476,7 +473,7 @@ func (p *Planner) loadTenantWork(

// If this is the first this we see this table, initialize the map
if tenantTableWork[table] == nil {
tenantTableWork[table] = make(map[string][]v1.FingerprintBounds, tenants.Len())
tenantTableWork[table] = make(map[string][]v1.FingerprintBounds, tenants.Remaining())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know this code too well, but I assume the behavior of Len and Remaining here is the same – i.e. Remaining doesn't do additional filtering, for example.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup :)

@salvacorts salvacorts merged commit c996349 into main Jun 7, 2024
60 checks passed
@salvacorts salvacorts deleted the salvacorts/bloom-refactor/planner-delete-tombstones-fix branch June 7, 2024 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants