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] Rebase warehouse proc framework (backport #52468) #52532

Merged
merged 1 commit into from
Nov 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2024

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 #52468 done by [Mergify](https://mergify.com). ## 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

@mergify mergify bot added the conflicts label Nov 1, 2024
Copy link
Contributor Author

mergify bot commented Nov 1, 2024

Cherry-pick of fadd6b6 has failed:

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

You are currently cherry-picking commit fadd6b6caf.
  (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:   fe/fe-core/src/main/java/com/starrocks/catalog/system/sys/GrantsTo.java
	modified:   fe/fe-core/src/main/java/com/starrocks/common/proc/ProcService.java
	new file:   fe/fe-core/src/main/java/com/starrocks/http/rest/WarehouseInfosBuilder.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/loadv2/LoadJob.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/loadv2/LoadMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/routineload/RoutineLoadJob.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/routineload/RoutineLoadMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/streamload/StreamLoadTask.java
	new file:   fe/fe-core/src/main/java/com/starrocks/metric/WarehouseMetricMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/server/WarehouseManager.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/parser/StarRocks.g4
	modified:   fe/fe-core/src/main/java/com/starrocks/warehouse/DefaultWarehouse.java
	new file:   fe/fe-core/src/main/java/com/starrocks/warehouse/LoadJobWithWarehouse.java
	modified:   fe/fe-core/src/main/java/com/starrocks/warehouse/Warehouse.java
	new file:   fe/fe-core/src/main/java/com/starrocks/warehouse/WarehouseInfo.java
	new file:   fe/fe-core/src/main/java/com/starrocks/warehouse/WarehouseLoadInfoBuilder.java
	new file:   fe/fe-core/src/main/java/com/starrocks/warehouse/WarehouseLoadStatusInfo.java
	new file:   fe/fe-core/src/main/java/com/starrocks/warehouse/WarehouseProcDir.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/load/streamload/StreamLoadMgr.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/service/FrontendServiceImpl.java

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

Copy link
Contributor Author

mergify bot commented Nov 1, 2024

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

auto-merge was automatically disabled November 1, 2024 02:36

Pull request was closed

@HangyuanLiu HangyuanLiu reopened this Nov 1, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) November 1, 2024 02:44
(cherry picked from commit fadd6b6)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/load/streamload/StreamLoadMgr.java
#	fe/fe-core/src/main/java/com/starrocks/service/FrontendServiceImpl.java
@HangyuanLiu HangyuanLiu force-pushed the mergify/bp/branch-3.3/pr-52468 branch from c417676 to b281eb7 Compare November 1, 2024 02:58
Copy link

sonarqubecloud bot commented Nov 1, 2024

@wanpengfei-git wanpengfei-git merged commit 55778f3 into branch-3.3 Nov 1, 2024
29 of 30 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.3/pr-52468 branch November 1, 2024 03:42
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