JingsongLi commented on code in PR #7882:
URL: https://github.com/apache/paimon/pull/7882#discussion_r3265309696
##########
paimon-api/src/main/java/org/apache/paimon/CoreOptions.java:
##########
@@ -2215,6 +2215,17 @@ public InlineElement getDescription() {
.defaultValue(false)
.withDescription("Whether enable data evolution for row
tracking table.");
+ @Immutable
+ public static final ConfigOption<Boolean> BRANCH_MERGE_ENABLED =
+ key("branch-merge.enabled")
Review Comment:
It looks like we don't need this option, just throw exception in branch
merging is oK.
##########
paimon-core/src/main/java/org/apache/paimon/io/PojoDataFileMeta.java:
##########
@@ -379,6 +379,31 @@ public PojoDataFileMeta assignFirstRowId(long firstRowId) {
writeCols);
}
+ @Override
+ public PojoDataFileMeta clearFirstRowId() {
Review Comment:
`newFirstRowId(@Nullable Long newFirstRowId)`
##########
paimon-api/src/main/java/org/apache/paimon/rest/RESTApi.java:
##########
@@ -1006,6 +1007,25 @@ public void fastForward(Identifier identifier, String
branch) {
restAuthFunction);
}
+ /**
+ * Merge branch for table.
+ *
+ * @param identifier database name and table name.
+ * @param sourceBranch source branch name
+ * @param targetBranch target branch name
+ * @throws NoSuchResourceException Exception thrown on HTTP 404 means the
branch or table not
+ * exists
+ * @throws ForbiddenException Exception thrown on HTTP 403 means don't
have the permission for
+ * this table
+ */
+ public void mergeBranch(Identifier identifier, String sourceBranch, String
targetBranch) {
Review Comment:
Why do we need it as a REST API? Does it feel like just creating a new
commit?
--
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]
