1

apache · Nov 22, 2024 · 61b8bde · 61b8bde
1 parent 127e597
commit 61b8bde
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/mtmv/BaseTableInfo.java b/fe/fe-core/src/main/java/org/apache/doris/mtmv/BaseTableInfo.java
@@ -110,6 +110,16 @@ public void setTableName(String tableName) {
         this.tableName = tableName;
     }
 
+    // if compatible failed due catalog dropped, ctlName will be null
+    public boolean isInternalTable() {
+        //
+        if (StringUtils.isEmpty(ctlName)) {
+            return InternalCatalog.INTERNAL_CATALOG_NAME.equals(ctlName);
+        } else {
+            return InternalCatalog.INTERNAL_CATALOG_ID == ctlId;
+        }
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

diff --git a/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVUtil.java b/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVUtil.java
@@ -28,7 +28,6 @@
 import org.apache.doris.common.MetaNotFoundException;
 import org.apache.doris.common.util.TimeUtils;
 import org.apache.doris.datasource.CatalogMgr;
-import org.apache.doris.datasource.InternalCatalog;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.functions.executable.DateTimeExtractAndTransform;
 import org.apache.doris.nereids.trees.expressions.literal.DateTimeV2Literal;
@@ -96,7 +95,7 @@ public static MTMV getMTMV(long dbId, long mtmvId) throws DdlException, MetaNotF
     public static boolean mtmvContainsExternalTable(MTMV mtmv) {
         Set<BaseTableInfo> baseTables = mtmv.getRelation().getBaseTablesOneLevel();
         for (BaseTableInfo baseTableInfo : baseTables) {
-            if (!baseTableInfo.getCtlName().equals(InternalCatalog.INTERNAL_CATALOG_NAME)) {
+            if (!baseTableInfo.isInternalTable()) {
                 return true;
             }
         }