[fix] Fix failed tests

apache · Jul 31, 2024 · f4ff5e6 · f4ff5e6
1 parent 072f9cc
commit f4ff5e6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/paimon-common/src/main/java/org/apache/paimon/utils/StringUtils.java b/paimon-common/src/main/java/org/apache/paimon/utils/StringUtils.java
@@ -373,7 +373,7 @@ public static String randomNumericString(int len) {
      * @return an array of parsed Strings, {@code null} if null String input
      */
     public static String[] split(final String str, final String separatorChars) {
-        return splitWorker(str, separatorChars, -1, false);
+        return split(str, separatorChars, -1, false);
     }
 
     /**
@@ -388,7 +388,7 @@ public static String[] split(final String str, final String separatorChars) {
      *     separators; if {@code false}, adjacent separators are treated as one separator.
      * @return an array of parsed Strings, {@code null} if null String input
      */
-    private static String[] splitWorker(
+    public static String[] split(
             final String str,
             final String separatorChars,
             final int max,

diff --git a/paimon-core/src/main/java/org/apache/paimon/catalog/Identifier.java b/paimon-core/src/main/java/org/apache/paimon/catalog/Identifier.java
@@ -115,7 +115,7 @@ private void splitObjectName() {
             return;
         }
 
-        String[] splits = StringUtils.split(object, Catalog.SYSTEM_TABLE_SPLITTER);
+        String[] splits = StringUtils.split(object, Catalog.SYSTEM_TABLE_SPLITTER, -1, true);
         if (splits.length == 1) {
             table = object;
             branch = null;
@@ -130,7 +130,9 @@ private void splitObjectName() {
                 systemTable = splits[1];
             }
         } else if (splits.length == 3) {
-            Preconditions.checkArgument(splits[1].startsWith(Catalog.SYSTEM_BRANCH_PREFIX));
+            Preconditions.checkArgument(
+                    splits[1].startsWith(Catalog.SYSTEM_BRANCH_PREFIX),
+                    "System table can only contain one '$' separator, but this is: " + object);
             table = splits[0];
             branch = splits[1].substring(Catalog.SYSTEM_BRANCH_PREFIX.length());
             systemTable = splits[2];

diff --git a/paimon-core/src/main/java/org/apache/paimon/schema/SchemaManager.java b/paimon-core/src/main/java/org/apache/paimon/schema/SchemaManager.java
@@ -598,6 +598,10 @@ public static Identifier identifierFromPath(String tablePath, boolean ignoreIfUn
 
     public static Identifier identifierFromPath(
             String tablePath, boolean ignoreIfUnknownDatabase, @Nullable String branchName) {
+        if (DEFAULT_MAIN_BRANCH.equals(branchName)) {
+            branchName = null;
+        }
+
         String[] paths = tablePath.split("/");
         if (paths.length < 2) {
             if (!ignoreIfUnknownDatabase) {
@@ -621,6 +625,7 @@ public static Identifier identifierFromPath(
             return new Identifier(UNKNOWN_DATABASE, paths[paths.length - 1], branchName, null);
         }
         database = database.substring(0, index);
+
         return new Identifier(database, paths[paths.length - 1], branchName, null);
     }
 }
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
@@ -130,9 +130,7 @@ public Identifier identifier() {
                 ? SchemaManager.identifierFromPath(
                         location().toUri().toString(),
                         true,
-                        options().containsKey(CoreOptions.BRANCH.key())
-                                ? coreOptions().branch()
-                                : null)
+                        options().get(CoreOptions.BRANCH.key()))
                 : identifier;
     }
 

diff --git a/paimon-core/src/test/java/org/apache/paimon/catalog/CatalogTestBase.java b/paimon-core/src/test/java/org/apache/paimon/catalog/CatalogTestBase.java
@@ -239,7 +239,7 @@ public void testCreateTable() throws Exception {
                                         DEFAULT_TABLE_SCHEMA,
                                         false))
                 .withMessage(
-                        "Cannot 'createTable' for system table 'Identifier{database='test_db', table='$system_table'}', please use data table.");
+                        "Cannot 'createTable' for system table 'Identifier{database='test_db', object='$system_table'}', please use data table.");
 
         // Create table throws DatabaseNotExistException when database does not exist
         assertThatExceptionOfType(Catalog.DatabaseNotExistException.class)
@@ -367,7 +367,7 @@ public void testDropTable() throws Exception {
                                 catalog.dropTable(
                                         Identifier.create("test_db", "$system_table"), false))
                 .withMessage(
-                        "Cannot 'dropTable' for system table 'Identifier{database='test_db', table='$system_table'}', please use data table.");
+                        "Cannot 'dropTable' for system table 'Identifier{database='test_db', object='$system_table'}', please use data table.");
 
         // Drop table throws TableNotExistException when table does not exist and ignoreIfNotExists
         // is false
@@ -402,7 +402,7 @@ public void testRenameTable() throws Exception {
                                         toTable,
                                         false))
                 .withMessage(
-                        "Cannot 'renameTable' for system table 'Identifier{database='test_db', table='$system_table'}', please use data table.");
+                        "Cannot 'renameTable' for system table 'Identifier{database='test_db', object='$system_table'}', please use data table.");
 
         assertThatExceptionOfType(IllegalArgumentException.class)
                 .isThrownBy(
@@ -412,7 +412,7 @@ public void testRenameTable() throws Exception {
                                         Identifier.create("test_db", "$system_table"),
                                         false))
                 .withMessage(
-                        "Cannot 'renameTable' for system table 'Identifier{database='test_db', table='$system_table'}', please use data table.");
+                        "Cannot 'renameTable' for system table 'Identifier{database='test_db', object='$system_table'}', please use data table.");
 
         // Rename table throws TableNotExistException when table does not exist
         assertThatExceptionOfType(Catalog.TableNotExistException.class)
@@ -466,7 +466,7 @@ public void testAlterTable() throws Exception {
                                                 SchemaChange.addColumn("col2", DataTypes.DATE())),
                                         false))
                 .withMessage(
-                        "Cannot 'alterTable' for system table 'Identifier{database='test_db', table='$system_table'}', please use data table.");
+                        "Cannot 'alterTable' for system table 'Identifier{database='test_db', object='$system_table'}', please use data table.");
 
         // Alter table throws TableNotExistException when table does not exist
         assertThatExceptionOfType(Catalog.TableNotExistException.class)