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 d59dc20be1c [fix](fe) remove deprecated version hash variables to
reduce memory (#59458)
d59dc20be1c is described below
commit d59dc20be1ca1d2c350fe6ec8d3d5e26a27e3bc4
Author: meiyi <[email protected]>
AuthorDate: Fri Jan 2 06:17:13 2026 +0800
[fix](fe) remove deprecated version hash variables to reduce memory (#59458)
---
.../java/org/apache/doris/catalog/Partition.java | 22 ----------------------
.../java/org/apache/doris/catalog/Replica.java | 11 -----------
.../main/java/org/apache/doris/catalog/Table.java | 12 ------------
.../main/java/org/apache/doris/catalog/Tablet.java | 12 ------------
4 files changed, 57 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java
index af6914b4fec..d6a3545088c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java
@@ -83,22 +83,12 @@ public class Partition extends MetaObject {
* next version(hash): next version is set after finished committing, it
should equals to committed version + 1
*/
- // not have committedVersion because committedVersion = nextVersion - 1
- @Deprecated
- @SerializedName(value = "cvh", alternate = {"committedVersionHash"})
- private long committedVersionHash;
@SerializedName(value = "vv", alternate = {"visibleVersion"})
private long visibleVersion;
@SerializedName(value = "vvt", alternate = {"visibleVersionTime"})
private long visibleVersionTime;
- @Deprecated
- @SerializedName(value = "vvh", alternate = {"visibleVersionHash"})
- private long visibleVersionHash;
@SerializedName(value = "nv", alternate = {"nextVersion"})
protected long nextVersion;
- @Deprecated
- @SerializedName(value = "nvh", alternate = {"nextVersionHash"})
- private long nextVersionHash;
@SerializedName(value = "di", alternate = {"distributionInfo"})
private DistributionInfo distributionInfo;
@@ -183,18 +173,6 @@ public class Partition extends MetaObject {
}
}
- /**
- * if visibleVersion is 1, do not return creation time but 0
- *
- * @return
- */
- public long getVisibleVersionTimeIgnoreInit() {
- if (visibleVersion == 1) {
- return 0L;
- }
- return visibleVersionTime;
- }
-
// The method updateVisibleVersionAndVersionHash is called when fe
restart, the visibleVersionTime is updated
protected void setVisibleVersion(long visibleVersion) {
this.visibleVersion = visibleVersion;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java
index 603d2876ee1..207fd6a8e8a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java
@@ -93,9 +93,6 @@ public class Replica {
// the version could be queried
@SerializedName(value = "v", alternate = {"version"})
private volatile long version;
- @Deprecated
- @SerializedName(value = "vh", alternate = {"versionHash"})
- private long versionHash = 0L;
private int schemaHash = -1;
@SerializedName(value = "ds", alternate = {"dataSize"})
private volatile long dataSize = 0;
@@ -109,17 +106,11 @@ public class Replica {
// the last load failed version
@SerializedName(value = "lfv", alternate = {"lastFailedVersion"})
private long lastFailedVersion = -1L;
- @Deprecated
- @SerializedName(value = "lfvh", alternate = {"lastFailedVersionHash"})
- private long lastFailedVersionHash = 0L;
// not serialized, not very important
private long lastFailedTimestamp = 0;
// the last load successful version
@SerializedName(value = "lsv", alternate = {"lastSuccessVersion"})
private long lastSuccessVersion = -1L;
- @Deprecated
- @SerializedName(value = "lsvh", alternate = {"lastSuccessVersionHash"})
- private long lastSuccessVersionHash = 0L;
@Setter
@Getter
@@ -438,7 +429,6 @@ public class Replica {
if (this.lastFailedVersion < this.version) {
this.lastFailedVersion = -1;
this.lastFailedTimestamp = -1;
- this.lastFailedVersionHash = 0;
}
if (this.lastFailedVersion > 0
&& this.lastSuccessVersion > this.lastFailedVersion) {
@@ -546,7 +536,6 @@ public class Replica {
// Case 4:
if (this.version >= this.lastFailedVersion) {
this.lastFailedVersion = -1;
- this.lastFailedVersionHash = 0;
this.lastFailedTimestamp = -1;
if (this.version < this.lastSuccessVersion) {
this.version = this.lastSuccessVersion;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
index 10f7a6d4659..9859e28dc12 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
@@ -73,7 +73,6 @@ public abstract class Table extends MetaObject implements
Writable, TableIf, Gso
public volatile boolean isDropped = false;
- private boolean hasCompoundKey = false;
@SerializedName(value = "id")
protected long id;
@SerializedName(value = "name")
@@ -118,8 +117,6 @@ public abstract class Table extends MetaObject implements
Writable, TableIf, Gso
*/
protected Map<String, Column> nameToColumn;
- // DO NOT persist this variable.
- protected boolean isTypeRead = false;
// table(view)'s comment
@SerializedName(value = "comment")
protected String comment = "";
@@ -350,14 +347,6 @@ public abstract class Table extends MetaObject implements
Writable, TableIf, Gso
this.commitLock.unlock();
}
- public boolean isTypeRead() {
- return isTypeRead;
- }
-
- public void setTypeRead(boolean isTypeRead) {
- this.isTypeRead = isTypeRead;
- }
-
public long getId() {
return id;
}
@@ -490,7 +479,6 @@ public abstract class Table extends MetaObject implements
Writable, TableIf, Gso
}
if (keys.size() > 1) {
keys.forEach(key -> key.setCompoundKey(true));
- hasCompoundKey = true;
}
}
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 0a07ffe82d3..2a1e83d3791 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
@@ -111,9 +111,6 @@ public class Tablet extends MetaObject {
protected List<Replica> replicas;
@SerializedName(value = "cv", alternate = {"checkedVersion"})
private long checkedVersion;
- @Deprecated
- @SerializedName(value = "cvs", alternate = {"checkedVersionHash"})
- private long checkedVersionHash;
@SerializedName(value = "ic", alternate = {"isConsistent"})
private boolean isConsistent;
@@ -158,10 +155,6 @@ public class Tablet extends MetaObject {
isConsistent = true;
}
- public void setIdForRestore(long tabletId) {
- this.id = tabletId;
- }
-
public long getId() {
return this.id;
}
@@ -449,11 +442,6 @@ public class Tablet extends MetaObject {
this.id = tabletId;
}
- public static void sortReplicaByVersionDesc(List<Replica> replicas) {
- // sort replicas by version. higher version in the tops
- replicas.sort(Replica.VERSION_DESC_COMPARATOR);
- }
-
@Override
public String toString() {
return "tabletId=" + this.id;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
