Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history 
Signed-off-by: lhy1024 <[email protected]>
  • Loading branch information
@lhy1024
lhy1024 committed Dec 26, 2022
1 parent ad1053f commit ef3dc5c
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions tests/server/storage/hot_region_storage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,33 +104,33 @@ func TestHotRegionStorage(t *testing.T) {
var next *storage.HistoryHotRegion
hotRegionStorage := leaderServer.GetServer().GetHistoryHotRegionStorage()
testutil.Eventually(re, func() bool { // wait for the history hot region to be written to the storage
iter = hotRegionStorage.NewIterator([]string{storage.WriteType.String()}, int64(startTime*1000), time.Now().UnixNano()/int64(time.Millisecond))
iter = hotRegionStorage.NewIterator([]string{statistics.Write.String()}, int64(startTime*1000), time.Now().UnixNano()/int64(time.Millisecond))
next, err = iter.Next()
return err == nil && next != nil
})
re.Equal(uint64(1), next.RegionID)
re.Equal(uint64(1), next.StoreID)
re.Equal(storage.WriteType.String(), next.HotRegionType)
re.Equal(statistics.Write.String(), next.HotRegionType)
next, err = iter.Next()
re.NoError(err)
re.NotNil(next)
re.Equal(uint64(2), next.RegionID)
re.Equal(uint64(2), next.StoreID)
re.Equal(storage.WriteType.String(), next.HotRegionType)
re.Equal(statistics.Write.String(), next.HotRegionType)
next, err = iter.Next()
re.NoError(err)
re.Nil(next)
iter = hotRegionStorage.NewIterator([]string{storage.ReadType.String()}, int64(startTime*1000), time.Now().UnixNano()/int64(time.Millisecond))
iter = hotRegionStorage.NewIterator([]string{statistics.Read.String()}, int64(startTime*1000), time.Now().UnixNano()/int64(time.Millisecond))
next, err = iter.Next()
re.Equal(uint64(3), next.RegionID)
re.Equal(uint64(1), next.StoreID)
re.Equal(storage.ReadType.String(), next.HotRegionType)
re.Equal(statistics.Read.String(), next.HotRegionType)
next, err = iter.Next()
re.NoError(err)
re.NotNil(next)
re.Equal(uint64(4), next.RegionID)
re.Equal(uint64(2), next.StoreID)
re.Equal(storage.ReadType.String(), next.HotRegionType)
re.Equal(statistics.Read.String(), next.HotRegionType)
next, err = iter.Next()
re.NoError(err)
re.Nil(next)
Expand Down Expand Up @@ -179,13 +179,13 @@ func TestHotRegionStorageReservedDayConfigChange(t *testing.T) {
var next *storage.HistoryHotRegion
testutil.Eventually(re, func() bool { // wait for the history hot region to be written to the storage
hotRegionStorage := leaderServer.GetServer().GetHistoryHotRegionStorage()
iter = hotRegionStorage.NewIterator([]string{storage.WriteType.String()}, int64(startTime*1000), time.Now().UnixNano()/int64(time.Millisecond))
iter = hotRegionStorage.NewIterator([]string{statistics.Write.String()}, int64(startTime*1000), time.Now().UnixNano()/int64(time.Millisecond))
next, err = iter.Next()
return err == nil && next != nil
})
re.Equal(uint64(1), next.RegionID)
re.Equal(uint64(1), next.StoreID)
re.Equal(storage.WriteType.String(), next.HotRegionType)
re.Equal(statistics.Write.String(), next.HotRegionType)
next, err = iter.Next()
re.NoError(err)
re.Nil(next)
Expand All @@ -199,13 +199,13 @@ func TestHotRegionStorageReservedDayConfigChange(t *testing.T) {
time.Sleep(10 * interval)
endTime := time.Now().UnixNano() / int64(time.Millisecond)
hotRegionStorage := leaderServer.GetServer().GetHistoryHotRegionStorage()
iter = hotRegionStorage.NewIterator([]string{storage.WriteType.String()}, int64(startTime*1000), endTime)
iter = hotRegionStorage.NewIterator([]string{statistics.Write.String()}, int64(startTime*1000), endTime)
next, err = iter.Next()
re.NoError(err)
re.NotNil(next)
re.Equal(uint64(1), next.RegionID)
re.Equal(uint64(1), next.StoreID)
re.Equal(storage.WriteType.String(), next.HotRegionType)
re.Equal(statistics.Write.String(), next.HotRegionType)
next, err = iter.Next()
re.NoError(err)
re.Nil(next)
Expand All @@ -215,19 +215,19 @@ func TestHotRegionStorageReservedDayConfigChange(t *testing.T) {
time.Sleep(3 * interval)
endTime = time.Now().UnixNano() / int64(time.Millisecond)
hotRegionStorage = leaderServer.GetServer().GetHistoryHotRegionStorage()
iter = hotRegionStorage.NewIterator([]string{storage.WriteType.String()}, int64(startTime*1000), endTime)
iter = hotRegionStorage.NewIterator([]string{statistics.Write.String()}, int64(startTime*1000), endTime)
next, err = iter.Next()
re.NoError(err)
re.NotNil(next)
re.Equal(uint64(1), next.RegionID)
re.Equal(uint64(1), next.StoreID)
re.Equal(storage.WriteType.String(), next.HotRegionType)
re.Equal(statistics.Write.String(), next.HotRegionType)
next, err = iter.Next()
re.NoError(err)
re.NotNil(next)
re.Equal(uint64(2), next.RegionID)
re.Equal(uint64(2), next.StoreID)
re.Equal(storage.WriteType.String(), next.HotRegionType)
re.Equal(statistics.Write.String(), next.HotRegionType)
}

func TestHotRegionStorageWriteIntervalConfigChange(t *testing.T) {
Expand Down Expand Up @@ -274,13 +274,13 @@ func TestHotRegionStorageWriteIntervalConfigChange(t *testing.T) {
var next *storage.HistoryHotRegion
testutil.Eventually(re, func() bool { // wait for the history hot region to be written to the storage
hotRegionStorage := leaderServer.GetServer().GetHistoryHotRegionStorage()
iter = hotRegionStorage.NewIterator([]string{storage.WriteType.String()}, int64(startTime*1000), time.Now().UnixNano()/int64(time.Millisecond))
iter = hotRegionStorage.NewIterator([]string{statistics.Write.String()}, int64(startTime*1000), time.Now().UnixNano()/int64(time.Millisecond))
next, err = iter.Next()
return err == nil && next != nil
})
re.Equal(uint64(1), next.RegionID)
re.Equal(uint64(1), next.StoreID)
re.Equal(storage.WriteType.String(), next.HotRegionType)
re.Equal(statistics.Write.String(), next.HotRegionType)
next, err = iter.Next()
re.NoError(err)
re.Nil(next)
Expand All @@ -295,13 +295,13 @@ func TestHotRegionStorageWriteIntervalConfigChange(t *testing.T) {
endTime := time.Now().UnixNano() / int64(time.Millisecond)
// it cant get new hot region because wait time smaller than hot region write interval
hotRegionStorage := leaderServer.GetServer().GetHistoryHotRegionStorage()
iter = hotRegionStorage.NewIterator([]string{storage.WriteType.String()}, int64(startTime*1000), endTime)
iter = hotRegionStorage.NewIterator([]string{statistics.Write.String()}, int64(startTime*1000), endTime)
next, err = iter.Next()
re.NoError(err)
re.NotNil(next)
re.Equal(uint64(1), next.RegionID)
re.Equal(uint64(1), next.StoreID)
re.Equal(storage.WriteType.String(), next.HotRegionType)
re.Equal(statistics.Write.String(), next.HotRegionType)
next, err = iter.Next()
re.NoError(err)
re.Nil(next)
Expand Down

0 comments on commit ef3dc5c

Please sign in to comment.