add unit test for get all

Signed-off-by: bufferflies <[email protected]>
tikv · Apr 7, 2023 · add9492 · add9492
1 parent d065501
commit add9492
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 4 deletions.
diff --git a/pkg/movingaverage/avg_over_time_test.go b/pkg/movingaverage/avg_over_time_test.go
@@ -84,6 +84,7 @@ func TestMinFilled(t *testing.T) {
 	for aotSize := 2; aotSize < 10; aotSize++ {
 		for mfSize := 2; mfSize < 10; mfSize++ {
 			tm := NewTimeMedian(aotSize, mfSize, interval)
+			re.Equal([]float64{}, tm.GetAll())
 			for i := 0; i < aotSize; i++ {
 				re.Equal(0.0, tm.Get())
 				tm.Add(rate*interval.Seconds(), interval)

diff --git a/pkg/movingaverage/max_filter.go b/pkg/movingaverage/max_filter.go
@@ -54,6 +54,9 @@ func (r *MaxFilter) Get() float64 {
 
 // GetAll returns all the data points.
 func (r *MaxFilter) GetAll() []float64 {
+	if r.count < r.size {
+		return r.records[:r.count]
+	}
 	return r.records
 }
 

diff --git a/pkg/movingaverage/max_filter_test.go b/pkg/movingaverage/max_filter_test.go
@@ -29,6 +29,7 @@ func TestMaxFilter(t *testing.T) {
 
 	mf := NewMaxFilter(5)
 	re.Equal(empty, mf.Get())
+	re.Equal([]float64{}, mf.GetAll())
 
 	checkReset(re, mf, empty)
 	checkAdd(re, mf, data, expected)

diff --git a/pkg/movingaverage/median_filter.go b/pkg/movingaverage/median_filter.go
@@ -55,6 +55,9 @@ func (r *MedianFilter) Get() float64 {
 }
 
 func (r *MedianFilter) GetAll() []float64 {
+	if r.count < r.size {
+		return r.records[:r.count]
+	}
 	return r.records
 }
 

diff --git a/pkg/movingaverage/moving_average_test.go b/pkg/movingaverage/moving_average_test.go
@@ -80,6 +80,7 @@ func TestMedianFilter(t *testing.T) {
 
 	mf := NewMedianFilter(5)
 	re.Equal(empty, mf.Get())
+	re.Equal([]float64{}, mf.GetAll())
 
 	checkReset(re, mf, empty)
 	checkAdd(re, mf, data, expected)

diff --git a/pkg/movingaverage/weight_moving_average.go b/pkg/movingaverage/weight_moving_average.go
@@ -68,6 +68,9 @@ func (w *WMA) Get() float64 {
 
 // GetAll returns all the data points.
 func (w *WMA) GetAll() []float64 {
+	if w.count < w.size {
+		return w.records[:w.count]
+	}
 	return w.records
 }
 

diff --git a/pkg/schedule/schedulers/hot_region.go b/pkg/schedule/schedulers/hot_region.go
@@ -267,7 +267,6 @@ func (h *hotScheduler) dispatch(typ statistics.RWType, cluster schedule.Cluster)
 	if h.conf.IsForbidRWType(typ) {
 		return nil
 	}
-
 	switch typ {
 	case statistics.Read:
 		return h.balanceHotReadRegions(cluster)
@@ -604,7 +603,6 @@ func (bs *balanceSolver) solve() []*operator.Operator {
 	if !bs.isValid() {
 		return nil
 	}
-
 	bs.cur = &solution{}
 	tryUpdateBestSolution := func() {
 		if label, ok := bs.filterUniformStore(); ok {
@@ -803,7 +801,6 @@ func (bs *balanceSolver) checkSrcByPriorityAndTolerance(minLoad, expectLoad *sta
 }
 
 func (bs *balanceSolver) checkSrcHistoryLoadByPriorityAndTolerance(current, expectLoad *statistics.StoreLoad, toleranceRatio float64) bool {
-	log.Info("check src history load", zap.Any("current", current), zap.Any("expect-load", expectLoad), zap.Any("bs", bs))
 	return bs.checkHistoryLoadsByPriority(current.HistoryLoads, func(i int) bool {
 		return slice.AllOf(current.HistoryLoads[i], func(j int) bool {
 			return current.HistoryLoads[i][j] > toleranceRatio*expectLoad.HistoryLoads[i][j]

diff --git a/pkg/schedule/schedulers/hot_region_test.go b/pkg/schedule/schedulers/hot_region_test.go
@@ -520,11 +520,13 @@ func TestHotWriteRegionScheduleByteRateOnlyWithTiFlash(t *testing.T) {
 		tikvKeysSum += float64(storesBytes[i]/100) / 10
 		tikvQuerySum += float64(storesBytes[i]/100) / 10
 	}
+
 	for i := uint64(1); i <= storeCount; i++ {
 		if i != downStoreID {
 			tc.UpdateStorageWrittenBytes(i, storesBytes[i])
 		}
 	}
+
 	{ // Check the load expect
 		aliveTiKVCount := float64(aliveTiKVLastID - aliveTiKVStartID + 1)
 		allowLeaderTiKVCount := aliveTiKVCount - 1 // store 5 with evict leader

diff --git a/pkg/statistics/store_hot_peers_infos.go b/pkg/statistics/store_hot_peers_infos.go
@@ -158,7 +158,6 @@ func summaryStoresLoadByEngine(
 		store := info.StoreInfo
 		id := store.GetID()
 		storeLoads, ok := storesLoads[id]
-		//storesHistoryLoads, ok1 := storesHistoryLoads[id]
 		if !ok || !collector.Filter(info, kind) {
 			continue
 		}