paimon icon indicating copy to clipboard operation
paimon copied to clipboard

[Feature]Implement replace branch in BranchManager

Open sunxiaojian opened this issue 1 year ago • 10 comments

Purpose

Linked issue: close https://github.com/apache/incubator-paimon/issues/2153

Tests

BranchActionITCase.testReplaceBranchToTargetBranch

API and Format

Documentation

sunxiaojian avatar Feb 27 '24 09:02 sunxiaojian

@FangYongs PTAL

sunxiaojian avatar Feb 27 '24 09:02 sunxiaojian

@FangYongs If you have time, could you please review this for me? thx

sunxiaojian avatar Feb 29 '24 03:02 sunxiaojian

@sunxiaojian Can you split the merge and replace branch in different PRs? I think the operations between them are quite different

FangYongs avatar Mar 01 '24 05:03 FangYongs

Can you split the merge and replace branch in different PRs? I think the operations between them are quite different

@FangYongs But they may use some of the same methods added in SnapshotManager and TagManager. The main methods for BranchManager are mergeBranch and replaceBranch.

sunxiaojian avatar Mar 01 '24 07:03 sunxiaojian

https://github.com/apache/incubator-paimon/pull/2862 Looks like there's been some conflict, do I need to close or change this pr?

TaoZex avatar Mar 02 '24 08:03 TaoZex

#2862 Looks like there's been some conflict, do I need to close or change this pr?

@TaoZex No need to close it. I will delete the merge branch section of this PR, and it will be based on yours.

sunxiaojian avatar Mar 03 '24 13:03 sunxiaojian

#2862 Looks like there's been some conflict, do I need to close or change this pr?

@TaoZex No need to close it. I will delete the merge branch section of this PR, and it will be based on yours.

Thanks for your reply.

TaoZex avatar Mar 03 '24 14:03 TaoZex

@sunxiaojian Can you split the merge and replace branch in different PRs? I think the operations between them are quite different

@FangYongs The merge branch has been removed, and the implementation of the merge branch is mainly based on #2862

sunxiaojian avatar Mar 03 '24 14:03 sunxiaojian

@FangYongs Please help to review this pr also. And I suggest the merge/replace branches could wait for the Flink read/write pr merged and do detailed tests base on Flink reading/writing, because the merging and replacing branches will impact on the main branch, which is risky. WDYT?

schnappi17 avatar Mar 07 '24 07:03 schnappi17

@FangYongs @schnappi17 Is there anything else that needs to be modified?

sunxiaojian avatar Mar 27 '24 12:03 sunxiaojian

Thanks @sunxiaojian @schnappi17 , +1

FangYongs avatar May 28 '24 07:05 FangYongs

+1 for this, thanks @sunxiaojian @FangYongs

schnappi17 avatar May 28 '24 07:05 schnappi17