fix

Signed-off-by: gengjun-git <[email protected]>
StarRocks · Sep 2, 2024 · ab2763a · ab2763a
1 parent d19dabe
commit ab2763a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/common/Config.java b/fe/fe-core/src/main/java/com/starrocks/common/Config.java
@@ -451,6 +451,7 @@ public class Config extends ConfigBase {
     @ConfField(mutable = true, aliases = {"ignore_unknown_log_id"})
     public static boolean ignore_unknown_operation_type = false;
 
+    @ConfField
     public static boolean ignore_unknown_subtype = false;
 
     /**

diff --git a/fe/fe-core/src/main/java/com/starrocks/persist/gson/GsonUtils.java b/fe/fe-core/src/main/java/com/starrocks/persist/gson/GsonUtils.java
@@ -82,7 +82,6 @@
 import com.starrocks.catalog.EsTable;
 import com.starrocks.catalog.ExpressionRangePartitionInfo;
 import com.starrocks.catalog.ExpressionRangePartitionInfoV2;
-import com.starrocks.catalog.ExternalOlapTable;
 import com.starrocks.catalog.FileTable;
 import com.starrocks.catalog.Function;
 import com.starrocks.catalog.HashDistributionInfo;
@@ -305,7 +304,6 @@ public class GsonUtils {
     private static final RuntimeTypeAdapterFactory<com.starrocks.catalog.Table> TABLE_TYPE_ADAPTER_FACTORY
             = RuntimeTypeAdapterFactory.of(com.starrocks.catalog.Table.class, "clazz")
             .registerSubtype(EsTable.class, "EsTable")
-            .registerSubtype(ExternalOlapTable.class, "ExternalOlapTable")
             .registerSubtype(FileTable.class, "FileTable")
             .registerSubtype(HiveTable.class, "HiveTable")
             .registerSubtype(HudiTable.class, "HudiTable")

diff --git a/fe/fe-core/src/main/java/com/starrocks/persist/metablock/SRMetaBlockReaderV2.java b/fe/fe-core/src/main/java/com/starrocks/persist/metablock/SRMetaBlockReaderV2.java
@@ -118,6 +118,7 @@ public <T> void readCollection(Class<T> classType, CollectionConsumer<? super T>
                 numJsonRead++;
                 action.accept(t);
             } catch (SubtypeNotFoundException e) {
+                LOG.info("ignore_unknown_subtype is {}", Config.ignore_unknown_subtype);
                 if (Config.ignore_unknown_subtype) {
                     LOG.warn("ignore unknown sub type: {}", e.getSubtype(), e);
                     numJsonRead++;

diff --git a/fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java b/fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java
@@ -2015,7 +2015,7 @@ protected boolean canSkipBadReplayedJournal(Throwable t) {
 
         // 3. ignore_unknown_subtype = true will skip the subtype not found failure which happens on downgrading
         if (t.getCause() != null && t.getCause() instanceof SubtypeNotFoundException) {
-            LOG.warn("ignore unknown subtype");
+            LOG.warn("ignore unknown subtype: {}", (((SubtypeNotFoundException) t.getCause()).getSubtype()));
             return true;
         }