[fix](fe) move some variables from Tablet to LocalTablet which are not used in CloudTablet

mymeiyi · mymeiyi · commit 223b4d9b5bb4 · 2025-12-27T11:09:06.000+08:00
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/EnvFactory.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/EnvFactory.java
@@ -99,11 +99,11 @@ public Type getTabletClass() {
     }
 
     public Tablet createTablet() {
-        return new Tablet();
+        return new LocalTablet();
     }
 
     public Tablet createTablet(long tabletId) {
-        return new Tablet(tabletId);
+        return new LocalTablet(tabletId);
     }
 
     public Replica createReplica() {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/LocalTablet.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/LocalTablet.java
@@ -0,0 +1,81 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.catalog;
+
+import org.apache.doris.common.Pair;
+import org.apache.doris.common.lock.MonitoredReentrantReadWriteLock;
+
+import com.google.gson.annotations.SerializedName;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Comparator;
+
+public class LocalTablet extends Tablet {
+    private static final Logger LOG = LogManager.getLogger(LocalTablet.class);
+
+    // cooldown conf
+    @SerializedName(value = "cri", alternate = {"cooldownReplicaId"})
+    private long cooldownReplicaId = -1;
+    @SerializedName(value = "ctm", alternate = {"cooldownTerm"})
+    private long cooldownTerm = -1;
+    private MonitoredReentrantReadWriteLock cooldownConfLock = new MonitoredReentrantReadWriteLock();
+
+    public LocalTablet() {
+    }
+
+    public LocalTablet(long tabletId) {
+        super(tabletId);
+    }
+
+    public void setCooldownConf(long cooldownReplicaId, long cooldownTerm) {
+        cooldownConfLock.writeLock().lock();
+        this.cooldownReplicaId = cooldownReplicaId;
+        this.cooldownTerm = cooldownTerm;
+        cooldownConfLock.writeLock().unlock();
+    }
+
+    public long getCooldownReplicaId() {
+        return cooldownReplicaId;
+    }
+
+    public Pair<Long, Long> getCooldownConf() {
+        cooldownConfLock.readLock().lock();
+        try {
+            return Pair.of(cooldownReplicaId, cooldownTerm);
+        } finally {
+            cooldownConfLock.readLock().unlock();
+        }
+    }
+
+    @Override
+    public long getRemoteDataSize() {
+        // if CooldownReplicaId is not init
+        // [fix](fe) move some variables from Tablet to LocalTablet which are not used in CloudTablet
+        if (cooldownReplicaId <= 0) {
+            return 0;
+        }
+        for (Replica r : replicas) {
+            if (r.getId() == cooldownReplicaId) {
+                return r.getRemoteDataSize();
+            }
+        }
+        // return replica with max remoteDataSize
+        return replicas.stream().max(Comparator.comparing(Replica::getRemoteDataSize)).get().getRemoteDataSize();
+    }
+}
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
@@ -23,7 +23,6 @@
 import org.apache.doris.cloud.catalog.CloudReplica;
 import org.apache.doris.common.Config;
 import org.apache.doris.common.FeConstants;
-import org.apache.doris.common.Pair;
 import org.apache.doris.common.UserException;
 import org.apache.doris.resource.Tag;
 import org.apache.doris.system.Backend;
@@ -41,7 +40,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -117,13 +115,6 @@ public TabletHealth() {
     @SerializedName(value = "ic", alternate = {"isConsistent"})
     private boolean isConsistent;
 
-    // cooldown conf
-    @SerializedName(value = "cri", alternate = {"cooldownReplicaId"})
-    private long cooldownReplicaId = -1;
-    @SerializedName(value = "ctm", alternate = {"cooldownTerm"})
-    private long cooldownTerm = -1;
-    private final Object cooldownConfLock = new Object();
-
     // last time that the tablet checker checks this tablet.
     // no need to persist
     private long lastStatusCheckTime = -1;
@@ -182,23 +173,6 @@ public boolean isConsistent() {
         return isConsistent;
     }
 
-    public void setCooldownConf(long cooldownReplicaId, long cooldownTerm) {
-        synchronized (cooldownConfLock) {
-            this.cooldownReplicaId = cooldownReplicaId;
-            this.cooldownTerm = cooldownTerm;
-        }
-    }
-
-    public long getCooldownReplicaId() {
-        return cooldownReplicaId;
-    }
-
-    public Pair<Long, Long> getCooldownConf() {
-        synchronized (cooldownConfLock) {
-            return Pair.of(cooldownReplicaId, cooldownTerm);
-        }
-    }
-
     protected boolean isLatestReplicaAndDeleteOld(Replica newReplica) {
         boolean delete = false;
         boolean hasBackend = false;
@@ -494,17 +468,7 @@ public long getDataSize(boolean singleReplica, boolean filterSizeZero) {
     }
 
     public long getRemoteDataSize() {
-        // if CooldownReplicaId is not init
-        if (cooldownReplicaId <= 0) {
-            return 0;
-        }
-        for (Replica r : replicas) {
-            if (r.getId() == cooldownReplicaId) {
-                return r.getRemoteDataSize();
-            }
-        }
-        // return replica with max remoteDataSize
-        return replicas.stream().max(Comparator.comparing(Replica::getRemoteDataSize)).get().getRemoteDataSize();
+        return 0;
     }
 
     public long getRowCount(boolean singleReplica) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletInvertedIndex.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletInvertedIndex.java
@@ -672,14 +672,14 @@ private boolean needSync(Replica replicaInFe, TTabletInfo backendTabletInfo) {
 
     private void handleCooldownConf(TabletMeta tabletMeta, TTabletInfo beTabletInfo,
             List<CooldownConf> cooldownConfToPush, List<CooldownConf> cooldownConfToUpdate) {
-        Tablet tablet;
+        LocalTablet tablet;
         try {
             OlapTable table = (OlapTable) Env.getCurrentInternalCatalog().getDbNullable(tabletMeta.getDbId())
                     .getTable(tabletMeta.getTableId())
                     .get();
             table.readLock();
             try {
-                tablet = table.getPartition(tabletMeta.getPartitionId()).getIndex(tabletMeta.getIndexId())
+                tablet = (LocalTablet) table.getPartition(tabletMeta.getPartitionId()).getIndex(tabletMeta.getIndexId())
                         .getTablet(beTabletInfo.tablet_id);
             } finally {
                 table.readUnlock();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java
@@ -19,6 +19,7 @@
 
 import org.apache.doris.catalog.DiskInfo;
 import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.LocalTablet;
 import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Replica;
 import org.apache.doris.catalog.Tablet;
@@ -136,7 +137,7 @@ public ProcResult fetchResult() throws AnalysisException {
                     path,
                     metaUrl,
                     compactionUrl,
-                    String.valueOf(tablet.getCooldownConf().first),
+                    String.valueOf(tablet instanceof LocalTablet ? ((LocalTablet) tablet).getCooldownConf().first : ""),
                     cooldownMetaId,
                     String.valueOf(queryHits));
             if (Config.isCloudMode()) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletsProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletsProcDir.java
@@ -19,6 +19,7 @@
 
 import org.apache.doris.catalog.DiskInfo;
 import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.LocalTablet;
 import org.apache.doris.catalog.MaterializedIndex;
 import org.apache.doris.catalog.Replica;
 import org.apache.doris.catalog.Table;
@@ -178,7 +179,8 @@ public List<List<Comparable>> fetchComparableResult(long version, long backendId
                         String compactionUrl = String.format(
                                 "http://" + hostPort + "/api/compaction/show?tablet_id=%d", tabletId);
                         tabletInfo.add(compactionUrl);
-                        tabletInfo.add(tablet.getCooldownConf().first);
+                        tabletInfo.add(
+                                tablet instanceof LocalTablet ? ((LocalTablet) tablet).getCooldownConf().first : "");
                         if (replica.getCooldownMetaId() == null) {
                             tabletInfo.add("");
                         } else {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownConfHandler.java b/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownConfHandler.java
@@ -18,6 +18,7 @@
 package org.apache.doris.cooldown;
 
 import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.LocalTablet;
 import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Replica;
 import org.apache.doris.catalog.Tablet;
@@ -83,7 +84,7 @@ private void updateCooldownConf(List<CooldownConf> confToUpdate) {
             int index = rand.nextInt(replicas.size());
             conf.setCooldownReplicaId(replicas.get(index).getId());
             // find TabletMeta to get cooldown term
-            Tablet tablet = getTablet(conf);
+            LocalTablet tablet = (LocalTablet) getTablet(conf);
             if (tablet == null || tablet.getCooldownConf().second != conf.cooldownTerm) {
                 // If tablet.cooldownTerm != conf.cooldownTerm, means cooldown conf of this tablet has been updated,
                 // should skip this update.
@@ -100,7 +101,7 @@ private void updateCooldownConf(List<CooldownConf> confToUpdate) {
 
         // update Tablet
         for (CooldownConf conf : updatedConf) {
-            Tablet tablet = tabletMap.get(conf.tabletId);
+            LocalTablet tablet = (LocalTablet) tabletMap.get(conf.tabletId);
             tablet.setCooldownConf(conf.cooldownReplicaId, conf.cooldownTerm);
             LOG.info("update cooldown conf. tabletId={} cooldownReplicaId={} cooldownTerm={}", conf.tabletId,
                     conf.cooldownReplicaId, conf.cooldownTerm);
@@ -135,7 +136,7 @@ private static Tablet getTablet(CooldownConf conf) {
 
     public static void replayUpdateCooldownConf(CooldownConfList cooldownConfList) {
         cooldownConfList.getCooldownConf().forEach(conf -> {
-            Tablet tablet = getTablet(conf);
+            LocalTablet tablet = (LocalTablet) getTablet(conf);
             if (tablet != null) {
                 tablet.setCooldownConf(conf.cooldownReplicaId, conf.cooldownTerm);
             }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
@@ -25,6 +25,7 @@
 import org.apache.doris.catalog.DiskInfo;
 import org.apache.doris.catalog.Env;
 import org.apache.doris.catalog.Index;
+import org.apache.doris.catalog.LocalTablet;
 import org.apache.doris.catalog.MaterializedIndex;
 import org.apache.doris.catalog.MaterializedIndex.IndexState;
 import org.apache.doris.catalog.MaterializedIndexMeta;
@@ -1533,7 +1534,7 @@ private static boolean addReplica(long tabletId, TabletMeta tabletMeta, TTabletI
                 if (backendTabletInfo.isSetCooldownMetaId()) {
                     // replica has cooldowned data
                     do {
-                        Pair<Long, Long> cooldownConf = tablet.getCooldownConf();
+                        Pair<Long, Long> cooldownConf = ((LocalTablet) tablet).getCooldownConf();
                         if (backendTabletInfo.getCooldownTerm() > cooldownConf.second) {
                             // should not be here
                             LOG.warn("report cooldownTerm({}) > cooldownTerm in TabletMeta({}), tabletId={}",
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java
@@ -85,6 +85,7 @@
 import org.apache.doris.catalog.JdbcTable;
 import org.apache.doris.catalog.ListPartitionInfo;
 import org.apache.doris.catalog.ListPartitionItem;
+import org.apache.doris.catalog.LocalTablet;
 import org.apache.doris.catalog.MTMV;
 import org.apache.doris.catalog.MapType;
 import org.apache.doris.catalog.MysqlDBTable;
@@ -528,10 +529,11 @@ public class GsonUtils {
     static {
         tabletTypeAdapterFactory = RuntimeTypeAdapterFactory
                 .of(Tablet.class, "clazz")
-                .registerSubtype(Tablet.class, Tablet.class.getSimpleName())
+                .registerSubtype(LocalTablet.class, LocalTablet.class.getSimpleName())
                 .registerSubtype(CloudTablet.class, CloudTablet.class.getSimpleName());
         if (Config.isNotCloudMode()) {
-            tabletTypeAdapterFactory.registerDefaultSubtype(Tablet.class);
+            tabletTypeAdapterFactory.registerDefaultSubtype(LocalTablet.class);
+            tabletTypeAdapterFactory.registerCompatibleSubtype(LocalTablet.class, Tablet.class.getSimpleName());
         } else {
             // compatible with old cloud code.
             tabletTypeAdapterFactory.registerDefaultSubtype(CloudTablet.class);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
@@ -32,6 +32,7 @@
 import org.apache.doris.catalog.DistributionInfo;
 import org.apache.doris.catalog.HashDistributionInfo;
 import org.apache.doris.catalog.Index;
+import org.apache.doris.catalog.LocalTablet;
 import org.apache.doris.catalog.MaterializedIndex;
 import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Partition;
@@ -559,8 +560,8 @@ private void addScanRangeLocations(Partition partition,
                 }
             }
 
-            if (isEnableCooldownReplicaAffinity(context)) {
-                final long coolDownReplicaId = tablet.getCooldownReplicaId();
+            if (Config.isNotCloudMode() && isEnableCooldownReplicaAffinity(context)) {
+                final long coolDownReplicaId = ((LocalTablet) tablet).getCooldownReplicaId();
                 // we prefer to query using cooldown replica to make sure the cache is fully utilized
                 // for example: consider there are 3BEs(A,B,C) and each has one replica for tablet X. and X
                 // is now under cooldown
diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -30,6 +30,7 @@
 import org.apache.doris.catalog.Database;
 import org.apache.doris.catalog.DatabaseIf;
 import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.LocalTablet;
 import org.apache.doris.catalog.MaterializedIndex;
 import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Partition;
@@ -394,7 +395,7 @@ public TConfirmUnusedRemoteFilesResult confirmUnusedRemoteFiles(TConfirmUnusedRe
                 return;
             }
             // check cooldownReplicaId
-            Pair<Long, Long> cooldownConf = tablet.getCooldownConf();
+            Pair<Long, Long> cooldownConf = ((LocalTablet) tablet).getCooldownConf();
             if (cooldownConf.first != info.cooldown_replica_id) {
                 LOG.info("cooldown replica id not match({} vs {}), tablet={}", cooldownConf.first,
                         info.cooldown_replica_id, info.tablet_id);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/cooldown/CooldownConfHandlerTest.java b/fe/fe-core/src/test/java/org/apache/doris/cooldown/CooldownConfHandlerTest.java
@@ -24,6 +24,7 @@
 import org.apache.doris.catalog.AccessPrivilegeWithCols;
 import org.apache.doris.catalog.Database;
 import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.LocalTablet;
 import org.apache.doris.catalog.MaterializedIndex;
 import org.apache.doris.catalog.Partition;
 import org.apache.doris.catalog.Replica;
@@ -55,7 +56,7 @@ public class CooldownConfHandlerTest extends TestWithFeService {
     private long indexId = 103L;
     private long tabletId = 104;
 
-    private Tablet tablet = null;
+    private LocalTablet tablet = null;
 
     @Override
     protected void runBeforeAll() throws Exception {
@@ -95,7 +96,7 @@ protected void runBeforeAll() throws Exception {
         indexId = index.getId();
         List<Tablet> tablets = index.getTablets();
         assert tablets.size() > 0;
-        tablet = tablets.get(0);
+        tablet = (LocalTablet) tablets.get(0);
         tablet.setCooldownConf(-1, 100);
         tabletId = tablet.getId();
         LOG.info("create table: db: {}, tbl: {}, partition: {}, index: {}, tablet: {}", dbId, tableId, partitionId,

Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,11 @@ public Type getTabletClass() {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`public Tablet createTablet() {`
`102`		`- return new Tablet();`
	`102`	`+ return new LocalTablet();`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`public Tablet createTablet(long tabletId) {`
`106`		`- return new Tablet(tabletId);`
	`106`	`+ return new LocalTablet(tabletId);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`public Replica createReplica() {`