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/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 3a7bb7e [improvement](fe-meta-version)Some if conditions do not use
the FeMetaVersion constant (#7879)
3a7bb7e is described below
commit 3a7bb7e144e74634df039685bbe3d2263140d3f8
Author: blackstar-baba <[email protected]>
AuthorDate: Fri Jan 28 22:25:17 2022 +0800
[improvement](fe-meta-version)Some if conditions do not use the
FeMetaVersion constant (#7879)
---
.../src/main/java/org/apache/doris/alter/AlterJob.java | 2 +-
.../src/main/java/org/apache/doris/catalog/MetaObject.java | 2 +-
.../src/main/java/org/apache/doris/catalog/Tablet.java | 3 ++-
.../main/java/org/apache/doris/common/FeMetaVersion.java | 14 ++++++++++++++
.../main/java/org/apache/doris/load/HadoopEtlJobInfo.java | 3 ++-
.../org/apache/doris/mysql/privilege/UserProperty.java | 2 +-
.../src/main/java/org/apache/doris/system/Backend.java | 4 ++--
7 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJob.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJob.java
index 0371702..5b1d5e4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJob.java
@@ -306,7 +306,7 @@ public abstract class AlterJob implements Writable {
public synchronized void readFields(DataInput in) throws IOException {
// read common members as write in AlterJob.write().
// except 'type' member, which is read in AlterJob.read()
- if (Catalog.getCurrentCatalogJournalVersion() >= 4) {
+ if (Catalog.getCurrentCatalogJournalVersion() >=
FeMetaVersion.VERSION_4) {
state = JobState.valueOf(Text.readString(in));
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaObject.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaObject.java
index b27d883..193987e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaObject.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaObject.java
@@ -61,7 +61,7 @@ public class MetaObject implements Writable {
this.signature = in.readLong();
}
- if (Catalog.getCurrentCatalogJournalVersion() >= 6) {
+ if (Catalog.getCurrentCatalogJournalVersion() >=
FeMetaVersion.VERSION_6) {
this.lastCheckTime = in.readLong();
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
index 8154d6d..6a4e8a7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
@@ -21,6 +21,7 @@ import org.apache.doris.catalog.Replica.ReplicaState;
import org.apache.doris.clone.TabletSchedCtx;
import org.apache.doris.clone.TabletSchedCtx.Priority;
import org.apache.doris.common.Config;
+import org.apache.doris.common.FeMetaVersion;
import org.apache.doris.common.Pair;
import org.apache.doris.common.io.Writable;
import org.apache.doris.resource.Tag;
@@ -341,7 +342,7 @@ public class Tablet extends MetaObject implements Writable {
}
}
- if (Catalog.getCurrentCatalogJournalVersion() >= 6) {
+ if (Catalog.getCurrentCatalogJournalVersion() >=
FeMetaVersion.VERSION_6) {
checkedVersion = in.readLong();
checkedVersionHash = in.readLong();
isConsistent = in.readBoolean();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/FeMetaVersion.java
b/fe/fe-core/src/main/java/org/apache/doris/common/FeMetaVersion.java
index 371eeb0..e05ba86 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/FeMetaVersion.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/FeMetaVersion.java
@@ -18,6 +18,20 @@
package org.apache.doris.common;
public final class FeMetaVersion {
+
+ public static final int VERSION_1 = 1;
+
+ public static final int VERSION_2 = 2;
+
+ public static final int VERSION_3 = 3;
+
+ public static final int VERSION_4 = 4;
+
+ public static final int VERSION_5 = 5;
+
+ public static final int VERSION_6 = 6;
+
+ public static final int VERSION_7 = 7;
// jira 1902
public static final int VERSION_8 = 8;
// jira 529
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/load/HadoopEtlJobInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/load/HadoopEtlJobInfo.java
index 8ada1bf..40f70d7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/HadoopEtlJobInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/HadoopEtlJobInfo.java
@@ -19,6 +19,7 @@ package org.apache.doris.load;
import org.apache.doris.catalog.Catalog;
import org.apache.doris.common.Config;
+import org.apache.doris.common.FeMetaVersion;
import org.apache.doris.common.io.Text;
import java.io.DataInput;
@@ -93,7 +94,7 @@ public class HadoopEtlJobInfo extends EtlJobInfo {
etlJobId = Text.readString(in);
etlOutputDir = Text.readString(in);
- if (Catalog.getCurrentCatalogJournalVersion() >= 7) {
+ if (Catalog.getCurrentCatalogJournalVersion() >=
FeMetaVersion.VERSION_7) {
if (in.readBoolean()) {
dppConfig = new DppConfig();
dppConfig.readFields(in);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
index 40f8725..08e5af8 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
@@ -543,7 +543,7 @@ public class UserProperty implements Writable {
// boolean isAdmin
in.readBoolean();
- if (Catalog.getCurrentCatalogJournalVersion() >= 1) {
+ if (Catalog.getCurrentCatalogJournalVersion() >=
FeMetaVersion.VERSION_1) {
// boolean isSuperuser
in.readBoolean();
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/Backend.java
b/fe/fe-core/src/main/java/org/apache/doris/system/Backend.java
index 8fa2401..3091a77 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/Backend.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/Backend.java
@@ -563,13 +563,13 @@ public class Backend implements Writable {
}
isAlive.set(in.readBoolean());
- if (Catalog.getCurrentCatalogJournalVersion() >= 5) {
+ if (Catalog.getCurrentCatalogJournalVersion() >=
FeMetaVersion.VERSION_5) {
isDecommissioned.set(in.readBoolean());
}
lastUpdateMs = in.readLong();
- if (Catalog.getCurrentCatalogJournalVersion() >= 2) {
+ if (Catalog.getCurrentCatalogJournalVersion() >=
FeMetaVersion.VERSION_2) {
lastStartTime = in.readLong();
Map<String, DiskInfo> disks = Maps.newHashMap();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
