move getSystemTable to CatalogUtils

apache · Dec 19, 2024 · 28c0a65 · 28c0a65
1 parent e997351
commit 28c0a65
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 35 deletions.
diff --git a/paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalog.java b/paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalog.java
@@ -59,6 +59,7 @@
 import static org.apache.paimon.CoreOptions.TYPE;
 import static org.apache.paimon.CoreOptions.createCommitUser;
 import static org.apache.paimon.catalog.CatalogUtils.checkNotBranch;
+import static org.apache.paimon.catalog.CatalogUtils.checkNotSystemDatabase;
 import static org.apache.paimon.catalog.CatalogUtils.checkNotSystemTable;
 import static org.apache.paimon.catalog.CatalogUtils.isSystemDatabase;
 import static org.apache.paimon.catalog.CatalogUtils.lockFactory;
@@ -383,20 +384,7 @@ public Table getTable(Identifier identifier) throws TableNotExistException {
                                     identifier.getTableName(),
                                     identifier.getBranchName(),
                                     null));
-            if (!(originTable instanceof FileStoreTable)) {
-                throw new UnsupportedOperationException(
-                        String.format(
-                                "Only data table support system tables, but this table %s is %s.",
-                                identifier, originTable.getClass()));
-            }
-            Table table =
-                    SystemTableLoader.load(
-                            Preconditions.checkNotNull(identifier.getSystemTableName()),
-                            (FileStoreTable) originTable);
-            if (table == null) {
-                throw new TableNotExistException(identifier);
-            }
-            return table;
+            return CatalogUtils.getSystemTable(identifier, originTable);
         } else {
             return getDataOrFormatTable(identifier);
         }
@@ -506,13 +494,6 @@ private void copyTableDefaultOptions(Map<String, String> options) {
         tableDefaultOptions.forEach(options::putIfAbsent);
     }
 
-    /** Validate database cannot be a system database. */
-    protected void checkNotSystemDatabase(String database) {
-        if (isSystemDatabase(database)) {
-            throw new ProcessSystemDatabaseException();
-        }
-    }
-
     private void validateAutoCreateClose(Map<String, String> options) {
         checkArgument(
                 !Boolean.parseBoolean(

diff --git a/paimon-core/src/main/java/org/apache/paimon/catalog/CatalogUtils.java b/paimon-core/src/main/java/org/apache/paimon/catalog/CatalogUtils.java
@@ -23,6 +23,10 @@
 import org.apache.paimon.fs.Path;
 import org.apache.paimon.options.Options;
 import org.apache.paimon.schema.SchemaManager;
+import org.apache.paimon.table.FileStoreTable;
+import org.apache.paimon.table.Table;
+import org.apache.paimon.table.system.SystemTableLoader;
+import org.apache.paimon.utils.Preconditions;
 
 import java.util.Map;
 import java.util.Optional;
@@ -73,6 +77,13 @@ public static boolean isSystemDatabase(String database) {
         return SYSTEM_DATABASE_NAME.equals(database);
     }
 
+    /** Validate database cannot be a system database. */
+    public static void checkNotSystemDatabase(String database) {
+        if (isSystemDatabase(database)) {
+            throw new Catalog.ProcessSystemDatabaseException();
+        }
+    }
+
     public static boolean isTableInSystemDatabase(Identifier identifier) {
         return isSystemDatabase(identifier.getDatabaseName()) || identifier.isSystemTable();
     }
@@ -132,4 +143,22 @@ public static Optional<CatalogLockContext> lockContext(Options options) {
     public static boolean lockEnabled(Options options, FileIO fileIO) {
         return options.getOptional(LOCK_ENABLED).orElse(fileIO != null && fileIO.isObjectStore());
     }
+
+    public static Table getSystemTable(Identifier identifier, Table originTable)
+            throws Catalog.TableNotExistException {
+        if (!(originTable instanceof FileStoreTable)) {
+            throw new UnsupportedOperationException(
+                    String.format(
+                            "Only data table support system tables, but this table %s is %s.",
+                            identifier, originTable.getClass()));
+        }
+        Table table =
+                SystemTableLoader.load(
+                        Preconditions.checkNotNull(identifier.getSystemTableName()),
+                        (FileStoreTable) originTable);
+        if (table == null) {
+            throw new Catalog.TableNotExistException(identifier);
+        }
+        return table;
+    }
 }
diff --git a/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java b/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java
@@ -22,6 +22,7 @@
 import org.apache.paimon.TableType;
 import org.apache.paimon.catalog.Catalog;
 import org.apache.paimon.catalog.CatalogContext;
+import org.apache.paimon.catalog.CatalogUtils;
 import org.apache.paimon.catalog.Database;
 import org.apache.paimon.catalog.Identifier;
 import org.apache.paimon.catalog.PropertyChange;
@@ -417,20 +418,7 @@ private Table getSystemTable(Identifier identifier) throws TableNotExistExceptio
                                 identifier.getTableName(),
                                 identifier.getBranchName(),
                                 null));
-        if (!(originTable instanceof FileStoreTable)) {
-            throw new UnsupportedOperationException(
-                    String.format(
-                            "Only data table support system tables, but this table %s is %s.",
-                            identifier, originTable.getClass()));
-        }
-        Table table =
-                SystemTableLoader.load(
-                        Preconditions.checkNotNull(identifier.getSystemTableName()),
-                        (FileStoreTable) originTable);
-        if (table == null) {
-            throw new TableNotExistException(identifier);
-        }
-        return table;
+        return CatalogUtils.getSystemTable(identifier, originTable);
     }
 
     private Table getDataOrFormatTable(Identifier identifier) throws TableNotExistException {

diff --git a/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java
@@ -101,6 +101,7 @@
 import static org.apache.paimon.CoreOptions.TYPE;
 import static org.apache.paimon.TableType.FORMAT_TABLE;
 import static org.apache.paimon.catalog.CatalogUtils.checkNotBranch;
+import static org.apache.paimon.catalog.CatalogUtils.checkNotSystemDatabase;
 import static org.apache.paimon.catalog.CatalogUtils.checkNotSystemTable;
 import static org.apache.paimon.catalog.CatalogUtils.isSystemDatabase;
 import static org.apache.paimon.catalog.CatalogUtils.lockFactory;