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 sorted queries do not produce sorted results for shardable queries #6125

Merged
merged 9 commits into from Feb 23, 2023
1 change: 1 addition & 0 deletions CHANGELOG.md
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

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
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