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 incorrect sorting of chunks in bloom-filtered response since ChunkRef.Cmp method is used in reverse #12999

Merged
merged 4 commits into from
May 29, 2024

Conversation

honganan
Copy link
Contributor

@honganan honganan commented May 21, 2024

The v1.ChunkRef.Cmp() method is used in reverse, and this can lead to chunks in bloom filtered result be sorted in descending but not ascending

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@honganan honganan requested a review from a team as a code owner May 21, 2024 03:20
@honganan honganan changed the title Fix incorrect sorting of chunks in bloom-filtered response since ChunkRef.Cmp method is used in reverse fix: Fix incorrect sorting of chunks in bloom-filtered response since ChunkRef.Cmp method is used in reverse May 21, 2024
Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

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

Nice catch! Instead of inverting the sort here, I think we should invert the Cmp method to naturally sort in ascending rather than desc order.

@honganan
Copy link
Contributor Author

honganan commented May 29, 2024

Nice catch! Instead of inverting the sort here, I think we should invert the Cmp method to naturally sort in ascending rather than desc order.

Fortunately it's not used anywhere. Modified!

@chaudum chaudum enabled auto-merge (squash) May 29, 2024 08:55
@chaudum chaudum disabled auto-merge May 29, 2024 13:08
@chaudum chaudum merged commit 670cd89 into grafana:main May 29, 2024
59 checks passed
@honganan honganan deleted the fix-bloom-response-sort branch May 30, 2024 01:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants