shuke987 commented on PR #65316: URL: https://github.com/apache/doris/pull/65316#issuecomment-4955374297
Checked the conflict against latest branch-4.1. The conflict is with the later branch-4.1 fix #65290 (commit 3bc9ea8e172), which already contains the correct E-2010 compaction wait semantics from #64945 plus the follow-up #65209 behavior: E-2010 + cumulative point advancement enters the handoff path, and the wait completes only after base success or cumulative success advances, not just cumulative failure time. Locally rebasing this PR head onto current branch-4.1 and resolving the conflict by keeping the branch-4.1 semantics makes the cherry-pick empty: origin/branch-4.1...HEAD is 0/0 and there is no diff. So this PR is effectively superseded by #65290 and can be closed rather than merged. I attempted to push the resolved branch, but this account does not have permission to update apache:auto-pick-64945-branch-4.1 (push denied for shuke987). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
