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] Enable partial update to be used with condition update (backport #30242) #30477

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 6, 2023

This is an automatic backport of pull request #30242 done by Mergify.
Cherry-pick of 9afa751 has failed:

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

You are currently cherry-picking commit 9afa75178e.
  (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/storage/rowset_update_state.cpp
	modified:   fe/fe-core/src/main/java/com/starrocks/load/Load.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/loadv2/LoadingTaskPlanner.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/routineload/KafkaRoutineLoadJob.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/routineload/PulsarRoutineLoadJob.java
	modified:   fe/fe-core/src/main/java/com/starrocks/planner/StreamLoadPlanner.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/ast/LoadStmt.java
	new file:   test/common/data/stream_load/sr_condition_update_1.csv
	new file:   test/common/data/stream_load/sr_condition_update_2.csv
	new file:   test/sql/test_condition_update/R/test_condition_update
	new file:   test/sql/test_condition_update/T/test_condition_update

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/src/storage/delta_writer.cpp

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

…30242)

Actually, we can do a partial update with a condition update, but we reject it. This pr enables it.

(cherry picked from commit 9afa751)

# Conflicts:
#	be/src/storage/delta_writer.cpp
@mergify
Copy link
Contributor Author

mergify bot commented Sep 6, 2023

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

@mergify mergify bot deleted the mergify/bp/branch-3.1/pr-30242 branch September 6, 2023 08:52
@sonarqubecloud
Copy link

sonarqubecloud bot commented Sep 6, 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 4 Code Smells

0.0% 0.0% Coverage
12.5% 12.5% Duplication

warning The version of Java (11.0.20.1) 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

@wanpengfei-git
Copy link
Collaborator

[FE Incremental Coverage Report]

😞 fail : 4 / 12 (33.33%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 com/starrocks/load/routineload/PulsarRoutineLoadJob.java 0 1 00.00% [414]
🔵 com/starrocks/load/Load.java 0 7 00.00% [138, 139, 140, 142, 144, 148, 151]
🔵 com/starrocks/planner/StreamLoadPlanner.java 1 1 100.00% []
🔵 com/starrocks/load/loadv2/LoadingTaskPlanner.java 1 1 100.00% []
🔵 com/starrocks/load/routineload/KafkaRoutineLoadJob.java 1 1 100.00% []
🔵 com/starrocks/sql/ast/LoadStmt.java 1 1 100.00% []

@wanpengfei-git
Copy link
Collaborator

[BE Incremental Coverage Report]

😞 fail : 3 / 5 (60.00%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 src/storage/delta_writer.cpp 2 4 50.00% [226, 231]
🔵 src/storage/rowset_update_state.cpp 1 1 100.00% []

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