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

querier: default to using batch.NewChunkMergeIterator #6814

Merged

Conversation

dimitarvdimitrov
Copy link
Contributor

This is a follow-up of #6673

This is a follow-up of 6673

Signed-off-by: Dimitar Dimitrov <[email protected]>
Signed-off-by: Dimitar Dimitrov <[email protected]>
@dimitarvdimitrov dimitarvdimitrov marked this pull request as ready for review December 4, 2023 16:05
@dimitarvdimitrov dimitarvdimitrov requested a review from a team as a code owner December 4, 2023 16:05
Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

Nice job, LGTM!

@dimitarvdimitrov dimitarvdimitrov merged commit e09acc9 into main Dec 4, 2023
@dimitarvdimitrov dimitarvdimitrov deleted the dimitar/querier/use-batch.NewChunkMergeIterator branch December 4, 2023 17:19
@grafanabot
Copy link
Contributor

The backport to r266 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-6814-to-r266 origin/r266
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e09acc913ef3cd9cdf303728ac6c3b7ff3272ac3
# Push it to GitHub
git push --set-upstream origin backport-6814-to-r266
git switch main
# Remove the local backport branch
git branch -D backport-6814-to-r266

Then, create a pull request where the base branch is r266 and the compare/head branch is backport-6814-to-r266.

grafanabot pushed a commit that referenced this pull request Dec 4, 2023
* querier: default to using batch.NewChunkMergeIterator

This is a follow-up of 6673

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove configurability of chunkIteratorFunc

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove configurability of chunkIteratorFunc in streaming code

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove unnecessary type declaration

Signed-off-by: Dimitar Dimitrov <[email protected]>

---------

Signed-off-by: Dimitar Dimitrov <[email protected]>
(cherry picked from commit e09acc9)
dimitarvdimitrov added a commit that referenced this pull request Dec 4, 2023
* querier: default to using batch.NewChunkMergeIterator

This is a follow-up of 6673

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove configurability of chunkIteratorFunc

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove configurability of chunkIteratorFunc in streaming code

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove unnecessary type declaration

Signed-off-by: Dimitar Dimitrov <[email protected]>

---------

Signed-off-by: Dimitar Dimitrov <[email protected]>
(cherry picked from commit e09acc9)
@grafanabot
Copy link
Contributor

The backport to r267 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-6814-to-r267 origin/r267
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e09acc913ef3cd9cdf303728ac6c3b7ff3272ac3
# Push it to GitHub
git push --set-upstream origin backport-6814-to-r267
git switch main
# Remove the local backport branch
git branch -D backport-6814-to-r267

Then, create a pull request where the base branch is r267 and the compare/head branch is backport-6814-to-r267.

pr00se pushed a commit that referenced this pull request Dec 6, 2023
* querier: default to using batch.NewChunkMergeIterator

This is a follow-up of 6673

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove configurability of chunkIteratorFunc

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove configurability of chunkIteratorFunc in streaming code

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove unnecessary type declaration

Signed-off-by: Dimitar Dimitrov <[email protected]>

---------

Signed-off-by: Dimitar Dimitrov <[email protected]>
(cherry picked from commit e09acc9)
pr00se added a commit that referenced this pull request Dec 6, 2023
* querier: default to using batch.NewChunkMergeIterator

This is a follow-up of 6673

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove configurability of chunkIteratorFunc

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove configurability of chunkIteratorFunc in streaming code

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Remove unnecessary type declaration

Signed-off-by: Dimitar Dimitrov <[email protected]>

---------

Signed-off-by: Dimitar Dimitrov <[email protected]>
(cherry picked from commit e09acc9)

Co-authored-by: Dimitar Dimitrov <[email protected]>
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