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 19f2adee47d [feature](merge-cloud) Add cloud related operation types
(#32769)
19f2adee47d is described below
commit 19f2adee47dff6c339ad04d93d31ecc4061169b0
Author: walter <w41te...@gmail.com>
AuthorDate: Mon Mar 25 23:00:37 2024 +0800
[feature](merge-cloud) Add cloud related operation types (#32769)
---
.../src/main/java/org/apache/doris/journal/JournalEntity.java | 7 +++++++
fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java | 6 ++++++
.../src/main/java/org/apache/doris/persist/OperationType.java | 5 +++++
.../src/main/java/org/apache/doris/persist/meta/MetaReader.java | 9 +++++++++
4 files changed, 27 insertions(+)
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 1c3f7444dd9..6f95f99aeb5 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
@@ -948,6 +948,13 @@ public class JournalEntity implements Writable {
isRead = true;
break;
}
+ // FIXME: support cloud related operation types.
+ case OperationType.OP_UPDATE_CLOUD_REPLICA:
+ case OperationType.OP_MODIFY_TTL_SECONDS:
+ case OperationType.OP_MODIFY_CLOUD_WARM_UP_JOB: {
+ isRead = true;
+ break;
+ }
default: {
IOException e = new IOException();
LOG.error("UNKNOWN Operation Type {}", opCode, e);
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 ffae17c6b1c..e8f66d4ac58 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
@@ -1200,6 +1200,12 @@ public class EditLog {
// TODO: implement this while statistics finished related
work.
break;
}
+ case OperationType.OP_UPDATE_CLOUD_REPLICA:
+ case OperationType.OP_MODIFY_TTL_SECONDS:
+ case OperationType.OP_MODIFY_CLOUD_WARM_UP_JOB: {
+ // TODO: support cloud replated operation type.
+ break;
+ }
default: {
IOException e = new IOException();
LOG.error("UNKNOWN Operation Type {}", opCode, e);
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 f5c71e58b72..6911003232d 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
@@ -384,6 +384,11 @@ public class OperationType {
public static final short OP_ALTER_ROLE = 475;
+ // For cloud.
+ public static final short OP_UPDATE_CLOUD_REPLICA = 1000;
+ public static final short OP_MODIFY_TTL_SECONDS = 1001;
+ public static final short OP_MODIFY_CLOUD_WARM_UP_JOB = 1002;
+
/**
* Get opcode name by op code.
**/
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/persist/meta/MetaReader.java
b/fe/fe-core/src/main/java/org/apache/doris/persist/meta/MetaReader.java
index 8024105fe26..8eb913d7f69 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/meta/MetaReader.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/meta/MetaReader.java
@@ -100,6 +100,15 @@ public class MetaReader {
LOG.info("Skip {} module since empty meta length in the
end.", metaIndex.name);
continue;
}
+ // FIXME: pick cloudWarmUpJob and remove below codes.
+ if (metaIndex.name.equals("cloudWarmUpJob")) {
+ LOG.warn("meta modules {} is not supported yet, ignore and
skip it", metaIndex.name);
+ // If this is the last module, nothing need to do.
+ if (i < metaFooter.metaIndices.size() - 1) {
+ IOUtils.skipFully(dis, metaFooter.metaIndices.get(i +
1).offset - metaIndex.offset);
+ }
+ continue;
+ }
// skip deprecated modules
if
(PersistMetaModules.DEPRECATED_MODULE_NAMES.contains(metaIndex.name)) {
LOG.warn("meta modules {} is deprecated, ignore and skip
it", metaIndex.name);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
