Closed mergify[bot] closed 1 day ago
Cherry-pick of 0dc29fa8e13d2a32750be471a18b00ceee0b2357 has failed:
On branch mergify/bp/branch-3.1/pr-53045
Your branch is up to date with 'origin/branch-3.1'.
You are currently cherry-picking commit 0dc29fa8e1.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: be/src/exec/pipeline/pipeline_driver.cpp
modified: be/src/exec/pipeline/scan/scan_operator.cpp
modified: docs/en/administration/query_profile_details.md
modified: docs/zh/administration/query_profile_details.md
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: be/src/exec/pipeline/operator.cpp
both modified: be/src/exec/pipeline/operator.h
both modified: be/src/exec/pipeline/query_context.cpp
both modified: be/src/exec/pipeline/query_context.h
both modified: be/src/runtime/current_thread.cpp
both modified: be/src/runtime/current_thread.h
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr
Why I'm doing:
remove profile nodes:
What I'm doing:
Fixes #issue
What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist:
Bugfix cherry-pick branch check:
This is an automatic backport of pull request #53045 done by Mergify.
Why I'm doing:
remove profile nodes:
What I'm doing:
Fixes #issue
What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist: