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 warehouse property might not take effect when executing load stmts (backport #49684) #55170

Open
wants to merge 2 commits into
base: branch-3.4
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 16, 2025

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

…load stmts (#49684)

Signed-off-by: drake_wang <[email protected]>
(cherry picked from commit c2c7666)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/http/rest/transaction/TransactionWithChannelHandler.java
Copy link
Contributor Author

mergify bot commented Jan 16, 2025

Cherry-pick of c2c7666 has failed:

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

You are currently cherry-picking commit c2c766692.
  (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/load/loadv2/LoadJob.java
	modified:   fe/fe-core/src/test/java/com/starrocks/http/StarRocksHttpTestCase.java
	modified:   fe/fe-core/src/test/java/com/starrocks/http/TransactionLoadActionTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/load/loadv2/LoadJobTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/load/loadv2/SparkLoadJobTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/load/streamload/StreamLoadManagerTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/http/rest/transaction/TransactionWithChannelHandler.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 Jan 16, 2025

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

@kevincai kevincai reopened this Jan 16, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) January 16, 2025 14:34
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