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.

Sign up for GitHub

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

Jump to bottom

Fix sorted queries do not produce sorted results for shardable queries #6125

Merged
merged 9 commits into from
Feb 23, 2023
Merged

Fix sorted queries do not produce sorted results for shardable queries #6125

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9d8a0e8
Fix sorted queries do not produce sorted results for shardable queries
harry671003 Feb 14, 2023
13ed2c6
Merge remote-tracking branch 'origin/main' into fix_sort_by
harry671003 Feb 14, 2023
de17014
Address PR comments
harry671003 Feb 14, 2023
1b60a77
Fix lint issues
harry671003 Feb 14, 2023
efab308
Pass request through MergeResponse()
harry671003 Feb 15, 2023
6a53006
Fix sort for topk and bottomk
harry671003 Feb 16, 2023
54e7c0f
Merge remote-tracking branch 'origin/main' into fix_sort_by
harry671003 Feb 22, 2023
3363bb7
Merge responses without sort for topk and bottomk
harry671003 Feb 22, 2023
bbc85a7
Minor update in the CHANGELOG
harry671003 Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
- [#6082](https://github.com/thanos-io/thanos/pull/6082) Store: Don't error when no stores are matched.
- [#6098](https://github.com/thanos-io/thanos/pull/6098) Cache/Redis: upgrade `rueidis` to v0.0.93 to fix potential panic when the client-side caching is disabled.
- [#6103](https://github.com/thanos-io/thanos/pull/6103) Mixins(Rule): Fix query for long rule evaluations.
- [#6123](https://github.com/thanos-io/thanos/pull/5123) Query Frontend: Fix sorted queries do not produce sorted results for shardable queries. Fixes [#6059](https://github.com/thanos-io/thanos/issues/6059)
yeya24 marked this conversation as resolved.
Show resolved Hide resolved

### Changed

Expand Down
201 changes: 126 additions & 75 deletions internal/cortex/querier/queryrange/queryrange.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions internal/cortex/querier/queryrange/queryrange.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ message PrometheusInstantQueryResponse {
string ErrorType = 3 [(gogoproto.jsontag) = "errorType,omitempty"];
string Error = 4 [(gogoproto.jsontag) = "error,omitempty"];
repeated PrometheusResponseHeader Headers = 5 [(gogoproto.jsontag) = "-"];
string Query = 6 [(gogoproto.jsontag) = "-"];
yeya24 marked this conversation as resolved.
Show resolved Hide resolved
}

message PrometheusInstantQueryData {
Expand Down