This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 1e5ed91e4d6 [fix](fe-meta) make FE meta be compatible with branch 2.0
(2.0.2.1 or later) (#26048)
1e5ed91e4d6 is described below
commit 1e5ed91e4d6867339448f7bab9ad7b0e74e2d70c
Author: Mingyu Chen <[email protected]>
AuthorDate: Sun Oct 29 14:45:21 2023 +0800
[fix](fe-meta) make FE meta be compatible with branch 2.0 (2.0.2.1 or
later) (#26048)
In branch 2.0, we changed the read/write method of AnalysisManager,
and rename the image module name to AnalysisMgrV2.
So we need to make the same change in master branch, so that user
can upgrade Doris from branch-2.0 to master branch.
After this PR, user can:
- upgrade from 2.0.x(or branch-2.0) to master
---
.../main/java/org/apache/doris/persist/meta/PersistMetaModules.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 3d2aa8b0eb9..99215bdd4bd 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
@@ -39,11 +39,11 @@ public class PersistMetaModules {
"globalVariable", "cluster", "broker", "resources", "exportJob",
"syncJob", "backupHandler",
"paloAuth", "transactionState", "colocateTableIndex",
"routineLoadJobs", "loadJobV2", "smallFiles",
"plugins", "deleteHandler", "sqlBlockRule", "policy",
"mtmvJobManager", "globalFunction", "workloadGroups",
- "binlogs", "resourceGroups", "AnalysisMgr", "AsyncJobManager",
"JobTaskManager");
+ "binlogs", "resourceGroups", "AnalysisMgrV2", "AsyncJobManager",
"JobTaskManager");
// 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<String> DEPRECATED_MODULE_NAMES =
ImmutableList.of(
- "loadJob", "cooldownJob");
+ "loadJob", "cooldownJob", "AnalysisMgr");
static {
MODULES_MAP = Maps.newHashMap();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
