[core] Validate FileStoreTableFactory create fallback branch

herefree · Nov 1, 2024 · 38fc717 · 38fc717
1 parent 5e99066
commit 38fc717
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/paimon-core/src/main/java/org/apache/paimon/table/FileStoreTableFactory.java b/paimon-core/src/main/java/org/apache/paimon/table/FileStoreTableFactory.java
@@ -29,8 +29,10 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.util.Optional;
 
 import static org.apache.paimon.CoreOptions.PATH;
+import static org.apache.paimon.utils.Preconditions.checkArgument;
 
 /** Factory to create {@link FileStoreTable}. */
 public class FileStoreTableFactory {
@@ -93,13 +95,17 @@ public static FileStoreTable create(
         if (!StringUtils.isNullOrWhitespaceOnly(fallbackBranch)) {
             Options branchOptions = new Options(dynamicOptions.toMap());
             branchOptions.set(CoreOptions.BRANCH, fallbackBranch);
+            Optional<TableSchema> schema =
+                    new SchemaManager(fileIO, tablePath, fallbackBranch).latest();
+            checkArgument(
+                    schema.isPresent(),
+                    "Cannot set '%s' = '%s' because the branch '%s' isn't existed.",
+                    CoreOptions.SCAN_FALLBACK_BRANCH.key(),
+                    fallbackBranch,
+                    fallbackBranch);
             FileStoreTable fallbackTable =
                     createWithoutFallbackBranch(
-                            fileIO,
-                            tablePath,
-                            new SchemaManager(fileIO, tablePath, fallbackBranch).latest().get(),
-                            branchOptions,
-                            catalogEnvironment);
+                            fileIO, tablePath, schema.get(), branchOptions, catalogEnvironment);
             table = new FallbackReadFileStoreTable(table, fallbackTable);
         }