This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 8e5f0637dcd [fix](editlog) Make OP_INIT_CATALOG compatible with the
old cloud code (#35989)
8e5f0637dcd is described below
commit 8e5f0637dcda26afa0fde1b290648bf129556fd2
Author: walter <w41te...@gmail.com>
AuthorDate: Fri Jun 7 15:02:58 2024 +0800
[fix](editlog) Make OP_INIT_CATALOG compatible with the old cloud code
(#35989)
---
fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java | 3 ++-
fe/fe-core/src/main/java/org/apache/doris/persist/OperationType.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
index c4431e5bd4c..170ba1b9bb6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
@@ -1014,7 +1014,8 @@ public class EditLog {
env.getAuth().replayAlterUser(log);
break;
}
- case OperationType.OP_INIT_CATALOG: {
+ case OperationType.OP_INIT_CATALOG:
+ case OperationType.OP_INIT_CATALOG_COMP: {
final InitCatalogLog log = (InitCatalogLog)
journal.getData();
env.getCatalogMgr().replayInitCatalog(log);
break;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/persist/OperationType.java
b/fe/fe-core/src/main/java/org/apache/doris/persist/OperationType.java
index 8116bec8da7..9e53667cd64 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/OperationType.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/OperationType.java
@@ -265,6 +265,7 @@ public class OperationType {
public static final short OP_ALTER_CATALOG_PROPS = 323;
public static final short OP_REFRESH_CATALOG = 324;
public static final short OP_INIT_CATALOG = 325;
+ public static final short OP_INIT_CATALOG_COMP = 10325; // compatible with
old cloud code.
public static final short OP_REFRESH_EXTERNAL_DB = 326;
public static final short OP_INIT_EXTERNAL_DB = 327;
public static final short OP_REFRESH_EXTERNAL_TABLE = 328;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
