From fb5b3029a764f74f79e9c12f1f1b18a0017a711c Mon Sep 17 00:00:00 2001 From: Mingyu Chen Date: Mon, 8 May 2023 10:00:09 +0800 Subject: [PATCH] [fix](meta) fix image file checksum error (#19363) --- fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java | 1 + .../java/org/apache/doris/datasource/InternalCatalog.java | 6 +----- .../org/apache/doris/persist/meta/PersistMetaModules.java | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java index f35d1d1fb8..ed720a8992 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java @@ -4638,6 +4638,7 @@ public class Env { return functionSet.isNullResultWithOneNullParamFunctions(funcName); } + @Deprecated public long loadCluster(DataInputStream dis, long checksum) throws IOException, DdlException { return getInternalCatalog().loadCluster(dis, checksum); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java index 270f928bdc..cf4bdc4272 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java @@ -2783,6 +2783,7 @@ public class InternalCatalog implements CatalogIf { } } + @Deprecated public long loadCluster(DataInputStream dis, long checksum) throws IOException, DdlException { int clusterCount = dis.readInt(); checksum ^= clusterCount; @@ -2792,11 +2793,6 @@ public class InternalCatalog implements CatalogIf { Cluster oldCluster = Cluster.read(dis); checksum ^= oldCluster.getId(); } - - InfoSchemaDb db = new InfoSchemaDb(SystemInfoService.DEFAULT_CLUSTER); - db.setClusterName(SystemInfoService.DEFAULT_CLUSTER); - idToDb.put(db.getId(), db); - fullNameToDb.put(db.getFullName(), db); return checksum; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/meta/PersistMetaModules.java b/fe/fe-core/src/main/java/org/apache/doris/persist/meta/PersistMetaModules.java index 5f1851fde4..9afe8b4ceb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/meta/PersistMetaModules.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/meta/PersistMetaModules.java @@ -36,13 +36,13 @@ public class PersistMetaModules { public static final ImmutableList MODULE_NAMES = ImmutableList.of( "masterInfo", "frontends", "backends", "datasource", "db", "alterJob", "recycleBin", - "globalVariable", "broker", "resources", "exportJob", "syncJob", "backupHandler", + "globalVariable", "cluster", "broker", "resources", "exportJob", "syncJob", "backupHandler", "paloAuth", "transactionState", "colocateTableIndex", "routineLoadJobs", "loadJobV2", "smallFiles", "plugins", "deleteHandler", "sqlBlockRule", "policy", "mtmvJobManager", "globalFunction", "resourceGroups"); // Modules in this list is deprecated and will not be saved in meta file. (also should not be in MODULE_NAMES) public static final ImmutableList DEPRECATED_MODULE_NAMES = ImmutableList.of( - "cluster", "loadJob", "cooldownJob"); + "loadJob", "cooldownJob"); static { MODULES_MAP = Maps.newHashMap();