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

[BugFix] fix running fragment count during exec env exit (backport #52048) #52089

Merged
merged 2 commits into from
Oct 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 18, 2024

  • need to support both pipeline engine and non-pipeline engine env
  • reject exec_batch_plan_fragments interface as well during shutdown

Why I'm doing:

What I'm doing:

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #52048 done by [Mergify](https://mergify.com). * need to support both pipeline engine and non-pipeline engine env * reject exec_batch_plan_fragments interface as well during shutdown

Why I'm doing:

What I'm doing:

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Signed-off-by: Kevin Xiaohua Cai <[email protected]>
(cherry picked from commit e259267)

# Conflicts:
#	be/src/testutil/init_test_env.h
@mergify mergify bot added the conflicts label Oct 18, 2024
Copy link
Contributor Author

mergify bot commented Oct 18, 2024

Cherry-pick of e259267 has failed:

On branch mergify/bp/branch-3.3/pr-52048
Your branch is up to date with 'origin/branch-3.3'.

You are currently cherry-picking commit e259267bb8.
  (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/runtime/exec_env.cpp
	modified:   be/src/runtime/exec_env.h
	modified:   be/src/service/internal_service.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/src/testutil/init_test_env.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 mergify bot closed this Oct 18, 2024
auto-merge was automatically disabled October 18, 2024 06:48

Pull request was closed

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 18, 2024 06:48
Copy link
Contributor Author

mergify bot commented Oct 18, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

Signed-off-by: Kevin Xiaohua Cai <[email protected]>
@kevincai kevincai reopened this Oct 18, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) October 18, 2024 06:58
@wanpengfei-git wanpengfei-git merged commit 94c3514 into branch-3.3 Oct 18, 2024
37 of 38 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.3/pr-52048 branch October 18, 2024 07:47
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.

2 participants