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

Cherry pick #59603 to 24.1: Fix crash in topK when merging empty states #59638

Conversation

robot-clickhouse-ci-2
Copy link
Contributor

Original pull-request #59603

This pull-request is a first step of an automated backporting.
It contains changes similar to calling git cherry-pick locally.
If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.

The check results does not matter at this step - you can safely ignore them.

Note

This pull-request will be merged automatically. Please, do not merge it manually (but if you accidentally did, nothing bad will happen).

Troubleshooting

If the PR was manually reopened after being closed

If this PR is stuck (i.e. not automatically merged after one day), check #59603 for pr-backports-created label and delete it.

Manually merging will do nothing. The pr-backports-created label prevents the original PR #59603 from being processed.

If the conflicts were resolved in a wrong way

If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:

  • delete the pr-cherrypick label from the PR
  • delete this branch from the repository

You also need to check the original PR #59603 for pr-backports-created, and delete if it's presented there

@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only! do not test disable testing on pull request labels Feb 6, 2024
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 merged commit faa4a1a into backport/24.1/59603 Feb 6, 2024
69 of 71 checks passed
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 deleted the cherrypick/24.1/b247440b7db03add4ffbf5f0f55a6457fa64d386 branch February 6, 2024 11:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do not test disable testing on pull request pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants