From 561ff3cab5922aeab62d217ca86f22761dcb04bd Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Mon, 22 Apr 2024 14:11:17 +0800 Subject: [PATCH] clean up Signed-off-by: Ryan Leung --- pkg/core/basic_cluster.go | 8 ++++---- pkg/keyspace/keyspace.go | 10 +++++----- pkg/mcs/scheduling/server/cluster.go | 2 +- server/cluster/cluster_test.go | 8 ++++---- server/cluster/scheduling_controller.go | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/core/basic_cluster.go b/pkg/core/basic_cluster.go index 8b3b18d412f..fb3adf1e2fb 100644 --- a/pkg/core/basic_cluster.go +++ b/pkg/core/basic_cluster.go @@ -30,7 +30,7 @@ func NewBasicCluster() *BasicCluster { // UpdateStoreStatus updates the information of the store. func (bc *BasicCluster) UpdateStoreStatus(storeID uint64) { - leaderCount, regionCount, witnessCount, learnerCount, pendingPeerCount, leaderRegionSize, regionSize := bc.RegionsInfo.GetStoreStats(storeID) + leaderCount, regionCount, witnessCount, learnerCount, pendingPeerCount, leaderRegionSize, regionSize := bc.GetStoreStats(storeID) bc.StoresInfo.UpdateStoreStatus(storeID, leaderCount, regionCount, witnessCount, learnerCount, pendingPeerCount, leaderRegionSize, regionSize) } @@ -38,7 +38,7 @@ func (bc *BasicCluster) UpdateStoreStatus(storeID uint64) { // GetLeaderStoreByRegionID returns the leader store of the given region. func (bc *BasicCluster) GetLeaderStoreByRegionID(regionID uint64) *StoreInfo { - region := bc.RegionsInfo.GetRegion(regionID) + region := bc.GetRegion(regionID) if region == nil || region.GetLeader() == nil { return nil } @@ -63,12 +63,12 @@ func (bc *BasicCluster) getWriteRate( // GetStoresLeaderWriteRate get total write rate of each store's leaders. func (bc *BasicCluster) GetStoresLeaderWriteRate() (storeIDs []uint64, bytesRates, keysRates []float64) { - return bc.getWriteRate(bc.RegionsInfo.GetStoreLeaderWriteRate) + return bc.getWriteRate(bc.GetStoreLeaderWriteRate) } // GetStoresWriteRate get total write rate of each store's regions. func (bc *BasicCluster) GetStoresWriteRate() (storeIDs []uint64, bytesRates, keysRates []float64) { - return bc.getWriteRate(bc.RegionsInfo.GetStoreWriteRate) + return bc.getWriteRate(bc.GetStoreWriteRate) } // UpdateAllStoreStatus updates the information of all stores. diff --git a/pkg/keyspace/keyspace.go b/pkg/keyspace/keyspace.go index d84b3698f69..b37ec7f0fca 100644 --- a/pkg/keyspace/keyspace.go +++ b/pkg/keyspace/keyspace.go @@ -343,20 +343,20 @@ func (manager *Manager) splitKeyspaceRegion(id uint32, waitRegionSplit bool) (er for { select { case <-ticker.C: - regionsInfo := manager.cluster.GetBasicCluster().RegionsInfo - region := regionsInfo.GetRegionByKey(rawLeftBound) + c := manager.cluster.GetBasicCluster() + region := c.GetRegionByKey(rawLeftBound) if region == nil || !bytes.Equal(region.GetStartKey(), rawLeftBound) { continue } - region = regionsInfo.GetRegionByKey(rawRightBound) + region = c.GetRegionByKey(rawRightBound) if region == nil || !bytes.Equal(region.GetStartKey(), rawRightBound) { continue } - region = regionsInfo.GetRegionByKey(txnLeftBound) + region = c.GetRegionByKey(txnLeftBound) if region == nil || !bytes.Equal(region.GetStartKey(), txnLeftBound) { continue } - region = regionsInfo.GetRegionByKey(txnRightBound) + region = c.GetRegionByKey(txnRightBound) if region == nil || !bytes.Equal(region.GetStartKey(), txnRightBound) { continue } diff --git a/pkg/mcs/scheduling/server/cluster.go b/pkg/mcs/scheduling/server/cluster.go index 62fe73fb934..d98de595415 100644 --- a/pkg/mcs/scheduling/server/cluster.go +++ b/pkg/mcs/scheduling/server/cluster.go @@ -515,7 +515,7 @@ func (c *Cluster) collectMetrics() { // collect hot cache metrics c.hotStat.CollectMetrics() // collect the lock metrics - c.RegionsInfo.CollectWaitLockMetrics() + c.CollectWaitLockMetrics() } func resetMetrics() { diff --git a/server/cluster/cluster_test.go b/server/cluster/cluster_test.go index 1024623eefc..a519538725d 100644 --- a/server/cluster/cluster_test.go +++ b/server/cluster/cluster_test.go @@ -893,10 +893,10 @@ func TestRegionHeartbeat(t *testing.T) { time.Sleep(50 * time.Millisecond) for _, store := range cluster.GetStores() { - re.Equal(cluster.BasicCluster.GetStoreLeaderCount(store.GetID()), store.GetLeaderCount()) - re.Equal(cluster.BasicCluster.GetStoreRegionCount(store.GetID()), store.GetRegionCount()) - re.Equal(cluster.BasicCluster.GetStoreLeaderRegionSize(store.GetID()), store.GetLeaderSize()) - re.Equal(cluster.BasicCluster.GetStoreRegionSize(store.GetID()), store.GetRegionSize()) + re.Equal(cluster.GetStoreLeaderCount(store.GetID()), store.GetLeaderCount()) + re.Equal(cluster.GetStoreRegionCount(store.GetID()), store.GetRegionCount()) + re.Equal(cluster.GetStoreLeaderRegionSize(store.GetID()), store.GetLeaderSize()) + re.Equal(cluster.GetStoreRegionSize(store.GetID()), store.GetRegionSize()) } // Test with storage. diff --git a/server/cluster/scheduling_controller.go b/server/cluster/scheduling_controller.go index 20d5a6bceae..ca846eaa885 100644 --- a/server/cluster/scheduling_controller.go +++ b/server/cluster/scheduling_controller.go @@ -195,7 +195,7 @@ func (sc *schedulingController) collectSchedulingMetrics() { // collect hot cache metrics sc.hotStat.CollectMetrics() // collect the lock metrics - sc.RegionsInfo.CollectWaitLockMetrics() + sc.CollectWaitLockMetrics() } func (sc *schedulingController) removeStoreStatistics(storeID uint64) {