This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch release-2.0.2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 5f6c18c89614ed4195e706178a0a076ee00bf734 Author: Mingyu Chen <[email protected]> AuthorDate: Mon Oct 30 20:53:39 2023 +0800 [branch2021](meta) add OP_ALTER_CATALOG_COMMENT for compatibility (#26122) --- .../main/java/org/apache/doris/journal/JournalEntity.java | 2 ++ .../src/main/java/org/apache/doris/persist/EditLog.java | 13 ++++--------- .../main/java/org/apache/doris/persist/OperationType.java | 3 +++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java b/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java index 5061b3c282c..35f90a5dcd8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java @@ -844,9 +844,11 @@ public class JournalEntity implements Writable { isRead = true; break; } + case OperationType.OP_ALTER_CATALOG_COMMENT: case OperationType.OP_UPDATE_TABLE_STATS: case OperationType.OP_PERSIST_AUTO_JOB: case OperationType.OP_DELETE_TABLE_STATS: { + // For backward compatible with 2.0.3 isRead = true; break; } 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 afc73c2b75d..581a461c41b 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 @@ -1059,16 +1059,11 @@ public class EditLog { env.getBinlogManager().addBarrierLog(log, logId); break; } - // For backward compatible with 2.0.3 - case OperationType.OP_UPDATE_TABLE_STATS: { - break; - } - // For backward compatible with 2.0.3 - case OperationType.OP_PERSIST_AUTO_JOB: { - break; - } - // For backward compatible with 2.0.3 + case OperationType.OP_ALTER_CATALOG_COMMENT: + case OperationType.OP_UPDATE_TABLE_STATS: + case OperationType.OP_PERSIST_AUTO_JOB: case OperationType.OP_DELETE_TABLE_STATS: { + // For backward compatible with 2.0.3 break; } default: { 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 14f540f78e7..99c643b212c 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 @@ -323,6 +323,9 @@ public class OperationType { // For backward compatible with 2.0.3 public static final short OP_DELETE_TABLE_STATS = 457; + // For backward compatible with 2.0.3 + public static final short OP_ALTER_CATALOG_COMMENT = 458; + /** * Get opcode name by op code. **/ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
