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 compatibility issue when collecting query statistics (backport #29678) #29731

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 22, 2023

This is an automatic backport of pull request #29678 done by Mergify.
Cherry-pick of be2f71b has failed:

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

You are currently cherry-picking commit be2f71b697.
  (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/pipeline_driver.h

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   be/src/exec/pipeline/stream_pipeline_driver.cpp
	both modified:   be/src/runtime/runtime_state.h
	both modified:   fe/fe-core/src/main/java/com/starrocks/qe/SessionVariable.java
	both modified:   gensrc/thrift/InternalService.thrift

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…9678)

Signed-off-by: silverbullet233 <3675229+silverbullet233@users.noreply.github.com>
(cherry picked from commit be2f71b)

# Conflicts:
#	be/src/exec/pipeline/stream_pipeline_driver.cpp
#	be/src/runtime/runtime_state.h
#	fe/fe-core/src/main/java/com/starrocks/qe/SessionVariable.java
#	gensrc/thrift/InternalService.thrift
@mergify mergify bot added the conflicts label Aug 22, 2023
@wanpengfei-git wanpengfei-git enabled auto-merge (rebase) August 22, 2023 14:00
@mergify mergify bot closed this Aug 22, 2023
auto-merge was automatically disabled August 22, 2023 14:00

Pull request was closed

@mergify
Copy link
Contributor Author

mergify bot commented Aug 22, 2023

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-29678 branch August 22, 2023 14:00
@wanpengfei-git
Copy link
Collaborator

[FE Incremental Coverage Report]

😞 fail : 1 / 3 (33.33%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 com/starrocks/qe/SessionVariable.java 1 3 33.33% [985, 986]

@wanpengfei-git
Copy link
Collaborator

[BE Incremental Coverage Report]

😞 fail : 137 / 200 (68.50%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 src/runtime/runtime_state.h 0 6 00.00% [332, 334, 336, 337, 338, 340]
🔵 src/exec/pipeline/pipeline_driver.cpp 4 6 66.67% [665, 684]
🔵 src/exec/pipeline/stream_pipeline_driver.cpp 133 188 70.74% [65, 67, 69, 70, 71, 80, 93, 94, 98, 134, 135, 136, 139, 140, 141, 142, 165, 166, 168, 169, 174, 214, 215, 218, 219, 224, 226, 228, 230, 231, 232, 233, 236, 237, 240, 241, 242, 243, 244, 246, 248, 251, 252, 253, 254, 256, 260, 262, 264, 266, 267, 268, 283, 289, 305]

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