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 querysharding labels analysis #5880

Merged
merged 4 commits into from Nov 11, 2022

Conversation

yeya24
Copy link
Contributor

@yeya24 yeya24 commented Nov 9, 2022

Signed-off-by: Ben Ye benye@amazon.com

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Fixes #5879

Changes

Remove the root expression analysis as it is not safe in some edge cases.
Change the sharding labels merge logic when we want to shard by and without at the same time.

Verification

Copy link
Contributor

@fpetkovski fpetkovski left a comment

Choose a reason for hiding this comment

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

Thanks, just one small nit.

pkg/querysharding/analyzer_test.go Outdated Show resolved Hide resolved
Signed-off-by: Ben Ye <benye@amazon.com>
fpetkovski
fpetkovski previously approved these changes Nov 11, 2022
Copy link
Contributor

@fpetkovski fpetkovski left a comment

Choose a reason for hiding this comment

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

Thanks, lgtm.

Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Ben Ye <benye@amazon.com>
@yeya24
Copy link
Contributor Author

yeya24 commented Nov 11, 2022

Sorry I just fixed the merge conflict. @fpetkovski Could you approve again? Thanks!

@yeya24
Copy link
Contributor Author

yeya24 commented Nov 11, 2022

I will ignore the lint error and merge it if other tests pass. The lint error was introduced by another commit we just merged so let's fix it in another pr.

@yeya24 yeya24 merged commit afc3bba into thanos-io:main Nov 11, 2022
@yeya24 yeya24 deleted the fix-querysharding-analysis branch November 11, 2022 09:16
ngraham20 pushed a commit to ngraham20/thanos that referenced this pull request May 18, 2023
* fix querysharding labels analysis

Signed-off-by: Ben Ye <benye@amazon.com>

* update changelog

Signed-off-by: Ben Ye <benye@amazon.com>

* fix lint

Signed-off-by: Ben Ye <benye@amazon.com>

* update test case

Signed-off-by: Ben Ye <benye@amazon.com>

Signed-off-by: Ben Ye <benye@amazon.com>
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.

Incorrect query sharding analysis result
2 participants