Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,12 @@ public enum PartitionState {
* 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;

Expand Down Expand Up @@ -183,18 +173,6 @@ public static List<Long> getVisibleVersions(List<? extends Partition> partitions
}
}

/**
* 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;
Expand Down
11 changes: 0 additions & 11 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ public static class ReplicaContext {
// 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;
Expand All @@ -109,17 +106,11 @@ public static class ReplicaContext {
// 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
Expand Down Expand Up @@ -438,7 +429,6 @@ public synchronized void adminUpdateVersionInfo(Long version, Long lastFailedVer
if (this.lastFailedVersion < this.version) {
this.lastFailedVersion = -1;
this.lastFailedTimestamp = -1;
this.lastFailedVersionHash = 0;
}
if (this.lastFailedVersion > 0
&& this.lastSuccessVersion > this.lastFailedVersion) {
Expand Down Expand Up @@ -546,7 +536,6 @@ private void updateReplicaVersion(long newVersion, long lastFailedVersion, long
// 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;
Expand Down
12 changes: 0 additions & 12 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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 = "";
Expand Down Expand Up @@ -350,14 +347,6 @@ public void commitUnlock() {
this.commitLock.unlock();
}

public boolean isTypeRead() {
return isTypeRead;
}

public void setTypeRead(boolean isTypeRead) {
this.isTypeRead = isTypeRead;
}

public long getId() {
return id;
}
Expand Down Expand Up @@ -490,7 +479,6 @@ public void gsonPostProcess() throws IOException {
}
if (keys.size() > 1) {
keys.forEach(key -> key.setCompoundKey(true));
hasCompoundKey = true;
}
}

Expand Down
12 changes: 0 additions & 12 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@ public TabletHealth() {
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;

Expand Down Expand Up @@ -158,10 +155,6 @@ private Tablet(long tabletId, List<Replica> replicas) {
isConsistent = true;
}

public void setIdForRestore(long tabletId) {
this.id = tabletId;
}

public long getId() {
return this.id;
}
Expand Down Expand Up @@ -449,11 +442,6 @@ public void setTabletId(long tabletId) {
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;
Expand Down
Loading