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

[Enhancement] Support profile for only big query (backport #33825) #34017

Merged
merged 2 commits into from
Oct 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 31, 2023

This is an automatic backport of pull request #33825 done by Mergify.
Cherry-pick of 0e2d056 has failed:

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

You are currently cherry-picking commit 0e2d0569a4.
  (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/fragment_executor.cpp
	modified:   fe/fe-core/src/main/java/com/starrocks/qe/ConnectContext.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   be/src/exec/pipeline/query_context.h
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/common/profile/Tracers.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/load/loadv2/LoadLoadingTask.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/load/streamload/StreamLoadTask.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/qe/DefaultCoordinator.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/qe/SessionVariable.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/qe/scheduler/Coordinator.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/qe/scheduler/QueryRuntimeProfile.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/qe/scheduler/dag/JobSpec.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

Signed-off-by: liuyehcf <[email protected]>
(cherry picked from commit 0e2d056)

# Conflicts:
#	be/src/exec/pipeline/query_context.h
#	fe/fe-core/src/main/java/com/starrocks/common/profile/Tracers.java
#	fe/fe-core/src/main/java/com/starrocks/load/loadv2/LoadLoadingTask.java
#	fe/fe-core/src/main/java/com/starrocks/load/streamload/StreamLoadTask.java
#	fe/fe-core/src/main/java/com/starrocks/qe/DefaultCoordinator.java
#	fe/fe-core/src/main/java/com/starrocks/qe/SessionVariable.java
#	fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java
#	fe/fe-core/src/main/java/com/starrocks/qe/scheduler/Coordinator.java
#	fe/fe-core/src/main/java/com/starrocks/qe/scheduler/QueryRuntimeProfile.java
#	fe/fe-core/src/main/java/com/starrocks/qe/scheduler/dag/JobSpec.java
#	gensrc/thrift/InternalService.thrift
@mergify mergify bot added the conflicts label Oct 31, 2023
@mergify mergify bot closed this Oct 31, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Oct 31, 2023

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

@mergify mergify bot deleted the mergify/bp/branch-3.0/pr-33825 branch October 31, 2023 06:22
@liuyehcf liuyehcf restored the mergify/bp/branch-3.0/pr-33825 branch October 31, 2023 07:23
@liuyehcf liuyehcf reopened this Oct 31, 2023
@wanpengfei-git wanpengfei-git enabled auto-merge (rebase) October 31, 2023 07:23
@liuyehcf liuyehcf force-pushed the mergify/bp/branch-3.0/pr-33825 branch 3 times, most recently from 7c4c3c9 to c99872b Compare October 31, 2023 08:08
Signed-off-by: liuyehcf <[email protected]>
@liuyehcf liuyehcf force-pushed the mergify/bp/branch-3.0/pr-33825 branch from 08cd115 to f797dc8 Compare October 31, 2023 08:32
@sonarcloud
Copy link

sonarcloud bot commented Oct 31, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

warning The version of Java (11.0.21) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@github-actions
Copy link

[FE Incremental Coverage Report]

fail : 13 / 20 (65.00%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 com/starrocks/load/loadv2/LoadLoadingTask.java 0 1 00.00% [190]
🔵 com/starrocks/qe/ConnectContext.java 4 8 50.00% [539, 542, 547, 548]
🔵 com/starrocks/qe/SessionVariable.java 3 4 75.00% [1373]
🔵 com/starrocks/qe/Coordinator.java 4 5 80.00% [1621]
🔵 com/starrocks/qe/StmtExecutor.java 2 2 100.00% []

@github-actions
Copy link

[BE Incremental Coverage Report]

fail : 1 / 8 (12.50%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 src/exec/pipeline/fragment_executor.cpp 0 2 00.00% [132, 134]
🔵 src/exec/pipeline/query_context.h 1 6 16.67% [92, 93, 95, 96, 97]

@wanpengfei-git wanpengfei-git merged commit 96dcc37 into branch-3.0 Oct 31, 2023
21 of 23 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.0/pr-33825 branch October 31, 2023 09:20
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