[fix] Trim branch name when deleting branch

xiaochen-zhou · xiaochen-zhou · commit 7841b7ec7594 · 2025-10-20T22:54:21.000+08:00
diff --git a/paimon-core/src/main/java/org/apache/paimon/table/AbstractFileStoreTable.java b/paimon-core/src/main/java/org/apache/paimon/table/AbstractFileStoreTable.java
@@ -656,6 +656,7 @@ public void createBranch(String branchName, String tagName) {
 
     @Override
     public void deleteBranch(String branchName) {
+        branchName = branchName.trim();
         String fallbackBranch =
                 coreOptions().toConfiguration().get(CoreOptions.SCAN_FALLBACK_BRANCH);
         if (!StringUtils.isNullOrWhitespaceOnly(fallbackBranch)
diff --git a/paimon-core/src/main/java/org/apache/paimon/utils/BranchManager.java b/paimon-core/src/main/java/org/apache/paimon/utils/BranchManager.java
@@ -50,7 +50,7 @@ default boolean branchExists(String branchName) {
     static String branchPath(Path tablePath, String branch) {
         return isMainBranch(branch)
                 ? tablePath.toString()
-                : tablePath.toString() + "/branch/" + BRANCH_PREFIX + branch;
+                : tablePath.toString() + "/branch/" + BRANCH_PREFIX + branch.trim();
     }
 
     static String normalizeBranch(String branch) {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ default boolean branchExists(String branchName) {`
`50`	`50`	`static String branchPath(Path tablePath, String branch) {`
`51`	`51`	`return isMainBranch(branch)`
`52`	`52`	`? tablePath.toString()`
`53`		`- : tablePath.toString() + "/branch/" + BRANCH_PREFIX + branch;`
	`53`	`+ : tablePath.toString() + "/branch/" + BRANCH_PREFIX + branch.trim();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`static String normalizeBranch(String branch) {`