github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/storage: re-use newTestStorage() instead of manually initializing Storage mock

Browse source 
This is a follow-up for d2d30581a0
This commit is contained in:
Aliaksandr Valialkin 2022-10-23 16:23:44 +03:00
parent d2d30581a0
commit 05512fdd74
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
7 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/storage/merge_test.go
View file

@ -366,8 +366,7 @@ func TestMergeForciblyStop(t *testing.T) {
var rowsMerged, rowsDeleted uint64
close(ch)
strg := &Storage{}
strg.setDeletedMetricIDs(nil)
strg := newTestStorage()
if err := mergeBlockStreams(&mp.ph, &bsw, bsrs, ch, strg, 0, &rowsMerged, &rowsDeleted); !errors.Is(err, errForciblyStopped) {
t.Fatalf("unexpected error in mergeBlockStreams: got %v; want %v", err, errForciblyStopped)
}
@ -387,8 +386,7 @@ func testMergeBlockStreams(t *testing.T, bsrs []*blockStreamReader, expectedBloc
var bsw blockStreamWriter
bsw.InitFromInmemoryPart(&mp)
strg := &Storage{}
strg.setDeletedMetricIDs(nil)
strg := newTestStorage()
var rowsMerged, rowsDeleted uint64
if err := mergeBlockStreams(&mp.ph, &bsw, bsrs, nil, strg, 0, &rowsMerged, &rowsDeleted); err != nil {
t.Fatalf("unexpected error in mergeBlockStreams: %s", err)

3
lib/storage/merge_timing_test.go
View file

@ -24,8 +24,7 @@ func BenchmarkMergeBlockStreamsFourSourcesBestCase(b *testing.B) {
func benchmarkMergeBlockStreams(b *testing.B, mps []*inmemoryPart, rowsPerLoop int64) {
var rowsMerged, rowsDeleted uint64
strg := &Storage{}
strg.setDeletedMetricIDs(nil)
strg := newTestStorage()
b.ReportAllocs()
b.SetBytes(rowsPerLoop)

3
lib/storage/partition_search_test.go
View file

@ -165,8 +165,7 @@ func testPartitionSearchEx(t *testing.T, ptt int64, tr TimeRange, partsCount, ma
})
// Create partition from rowss and test search on it.
strg := &Storage{}
strg.setDeletedMetricIDs(nil)
strg := newTestStorage()
retentionMsecs := timestampFromTime(time.Now()) - ptr.MinTimestamp + 3600*1000
var isReadOnly uint32
pt, err := createPartition(ptt, "./small-table", "./big-table", strg, retentionMsecs, &isReadOnly)

3
lib/storage/table_search_test.go
View file

@ -181,8 +181,7 @@ func testTableSearchEx(t *testing.T, trData, trSearch TimeRange, partitionsCount
})
// Create a table from rowss and test search on it.
strg := &Storage{}
strg.setDeletedMetricIDs(nil)
strg := newTestStorage()
var isReadOnly uint32
tb, err := openTable("./test-table", strg, maxRetentionMsecs, &isReadOnly)
if err != nil {

6
lib/storage/table_search_timing_test.go
View file

@ -44,8 +44,7 @@ func openBenchTable(b *testing.B, startTimestamp int64, rowsPerInsert, rowsCount
createBenchTable(b, path, startTimestamp, rowsPerInsert, rowsCount, tsidsCount)
createdBenchTables[path] = true
}
strg := &Storage{}
strg.setDeletedMetricIDs(nil)
strg := newTestStorage()
var isReadOnly uint32
tb, err := openTable(path, strg, maxRetentionMsecs, &isReadOnly)
if err != nil {
@ -70,8 +69,7 @@ var createdBenchTables = make(map[string]bool)
func createBenchTable(b *testing.B, path string, startTimestamp int64, rowsPerInsert, rowsCount, tsidsCount int) {
b.Helper()
strg := &Storage{}
strg.setDeletedMetricIDs(nil)
strg := newTestStorage()
var isReadOnly uint32
tb, err := openTable(path, strg, maxRetentionMsecs, &isReadOnly)
if err != nil {

6
lib/storage/table_test.go
View file

@ -17,8 +17,7 @@ func TestTableOpenClose(t *testing.T) {
}()
// Create a new table
strg := &Storage{}
strg.setDeletedMetricIDs(nil)
strg := newTestStorage()
var isReadOnly uint32
tb, err := openTable(path, strg, retentionMsecs, &isReadOnly)
if err != nil {
@ -46,8 +45,7 @@ func TestTableOpenMultipleTimes(t *testing.T) {
_ = os.RemoveAll(path)
}()
strg := &Storage{}
strg.setDeletedMetricIDs(nil)
strg := newTestStorage()
var isReadOnly uint32
tb1, err := openTable(path, strg, retentionMsecs, &isReadOnly)
if err != nil {

3
lib/storage/table_timing_test.go
View file

@ -45,8 +45,7 @@ func benchmarkTableAddRows(b *testing.B, rowsPerInsert, tsidsCount int) {
b.ReportAllocs()
b.SetBytes(int64(rowsCountExpected))
tablePath := "./benchmarkTableAddRows"
strg := &Storage{}
strg.setDeletedMetricIDs(nil)
strg := newTestStorage()
for i := 0; i < b.N; i++ {
var isReadOnly uint32
tb, err := openTable(tablePath, strg, maxRetentionMsecs, &isReadOnly)