Skip to content

Commit

Permalink
misc: convert more code to build with stringlabels
Browse files Browse the repository at this point in the history 
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
  • Loading branch information
@MichaHoffmann
MichaHoffmann committed May 20, 2024
1 parent 9e6cbd9 commit 2ae647f
Show file tree
Hide file tree
Showing 8 changed files with 145 additions and 150 deletions.
12 changes: 6 additions & 6 deletions pkg/api/blocks/v1_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ func TestMarkBlockEndpoint(t *testing.T) {

// create block
b1, err := e2eutil.CreateBlock(ctx, tmpDir, []labels.Labels{
{{Name: "a", Value: "1"}},
{{Name: "a", Value: "2"}},
{{Name: "a", Value: "3"}},
{{Name: "a", Value: "4"}},
{{Name: "b", Value: "1"}},
}, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "val1"}}, 124, metadata.NoneFunc)
labels.FromStrings("a", "1"),
labels.FromStrings("a", "2"),
labels.FromStrings("a", "3"),
labels.FromStrings("a", "4"),
labels.FromStrings("b", "1"),
}, 100, 0, 1000, labels.FromStrings("ext1", "val1"), 124, metadata.NoneFunc)
testutil.Ok(t, err)

// upload block
Expand Down
68 changes: 33 additions & 35 deletions pkg/block/indexheader/header_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,25 @@ func TestReaders(t *testing.T) {

// Create block index version 2.
id1, err := e2eutil.CreateBlock(ctx, tmpDir, []labels.Labels{
{{Name: "a", Value: "1"}},
{{Name: "a", Value: "2"}},
{{Name: "a", Value: "3"}},
{{Name: "a", Value: "4"}},
{{Name: "a", Value: "5"}},
{{Name: "a", Value: "6"}},
{{Name: "a", Value: "7"}},
{{Name: "a", Value: "8"}},
{{Name: "a", Value: "9"}},
labels.FromStrings("a", "1"),
labels.FromStrings("a", "2"),
labels.FromStrings("a", "3"),
labels.FromStrings("a", "4"),
labels.FromStrings("a", "5"),
labels.FromStrings("a", "6"),
labels.FromStrings("a", "7"),
labels.FromStrings("a", "8"),
labels.FromStrings("a", "9"),
// Missing 10 on purpose.
{{Name: "a", Value: "11"}},
{{Name: "a", Value: "12"}},
{{Name: "a", Value: "13"}},
{{Name: "a", Value: "1"}, {Name: "longer-string", Value: "1"}},
{{Name: "a", Value: "1"}, {Name: "longer-string", Value: "2"}},
{{Name: "cluster", Value: "a-eu-west-1"}},
{{Name: "cluster", Value: "b-eu-west-1"}},
{{Name: "cluster", Value: "c-eu-west-1"}},
}, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "1"}}, 124, metadata.NoneFunc)
labels.FromStrings("a", "11"),
labels.FromStrings("a", "12"),
labels.FromStrings("a", "13"),
labels.FromStrings("a", "1", "longer-string", "1"),
labels.FromStrings("a", "1", "longer-string", "2"),
labels.FromStrings("cluster", "a-eu-west-1"),
labels.FromStrings("cluster", "b-eu-west-1"),
labels.FromStrings("cluster", "c-eu-west-1"),
}, 100, 0, 1000, labels.FromStrings("ext1", "1"), 124, metadata.NoneFunc)
testutil.Ok(t, err)

testutil.Ok(t, block.Upload(ctx, log.NewNopLogger(), bkt, filepath.Join(tmpDir, id1.String()), metadata.NoneFunc))
Expand All @@ -87,7 +87,7 @@ func TestReaders(t *testing.T) {
e2eutil.Copy(t, "./testdata/index_format_v1", filepath.Join(tmpDir, m.ULID.String()))

_, err = metadata.InjectThanos(log.NewNopLogger(), filepath.Join(tmpDir, m.ULID.String()), metadata.Thanos{
Labels: labels.Labels{{Name: "ext1", Value: "1"}}.Map(),
Labels: labels.FromStrings("ext1", "1").Map(),
Downsample: metadata.ThanosDownsample{Resolution: 0},
Source: metadata.TestSource,
}, &m.BlockMeta)
Expand Down Expand Up @@ -381,7 +381,7 @@ func prepareIndexV2Block(t testing.TB, tmpDir string, bkt objstore.Bucket) *meta
e2eutil.Copy(t, "./testdata/index_format_v2", filepath.Join(tmpDir, m.ULID.String()))

_, err = metadata.InjectThanos(log.NewNopLogger(), filepath.Join(tmpDir, m.ULID.String()), metadata.Thanos{
Labels: labels.Labels{{Name: "ext1", Value: "1"}}.Map(),
Labels: labels.FromStrings("ext1", "1").Map(),
Downsample: metadata.ThanosDownsample{Resolution: 0},
Source: metadata.TestSource,
}, &m.BlockMeta)
Expand Down Expand Up @@ -453,11 +453,11 @@ func benchmarkBinaryReaderLookupSymbol(b *testing.B, numSeries int) {
// Generate series labels.
seriesLabels := make([]labels.Labels, 0, numSeries)
for i := 0; i < numSeries; i++ {
seriesLabels = append(seriesLabels, labels.Labels{{Name: "a", Value: strconv.Itoa(i)}})
seriesLabels = append(seriesLabels, labels.FromStrings("a", strconv.Itoa(i)))
}

// Create a block.
id1, err := e2eutil.CreateBlock(ctx, tmpDir, seriesLabels, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "1"}}, 124, metadata.NoneFunc)
id1, err := e2eutil.CreateBlock(ctx, tmpDir, seriesLabels, 100, 0, 1000, labels.FromStrings("ext1", "1"), 124, metadata.NoneFunc)
testutil.Ok(b, err)
testutil.Ok(b, block.Upload(ctx, logger, bkt, filepath.Join(tmpDir, id1.String()), metadata.NoneFunc))

Expand Down Expand Up @@ -573,27 +573,25 @@ func TestReaderPostingsOffsets(t *testing.T) {
continue
}
valueSet[idx] = struct{}{}
clusterLbls = append(clusterLbls, []labels.Label{
{Name: "cluster", Value: totalValues[idx]},
})
clusterLbls = append(clusterLbls, labels.FromStrings("cluster", totalValues[idx]))
i++
}

// Add additional labels.
lbls := append([]labels.Labels{
{{Name: "job", Value: "1"}},
{{Name: "job", Value: "2"}},
{{Name: "job", Value: "3"}},
{{Name: "job", Value: "4"}},
{{Name: "job", Value: "5"}},
{{Name: "job", Value: "6"}},
{{Name: "job", Value: "7"}},
{{Name: "job", Value: "8"}},
{{Name: "job", Value: "9"}}}, clusterLbls...)
labels.FromStrings("job", "1"),
labels.FromStrings("job", "2"),
labels.FromStrings("job", "3"),
labels.FromStrings("job", "4"),
labels.FromStrings("job", "5"),
labels.FromStrings("job", "6"),
labels.FromStrings("job", "7"),
labels.FromStrings("job", "8"),
labels.FromStrings("job", "9")}, clusterLbls...)
bkt, err := filesystem.NewBucket(filepath.Join(tmpDir, "bkt"))
testutil.Ok(t, err)
defer func() { testutil.Ok(t, bkt.Close()) }()
id, err := e2eutil.CreateBlock(ctx, tmpDir, lbls, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "1"}}, 124, metadata.NoneFunc)
id, err := e2eutil.CreateBlock(ctx, tmpDir, lbls, 100, 0, 1000, labels.FromStrings("ext1", "1"), 124, metadata.NoneFunc)
testutil.Ok(t, err)

testutil.Ok(t, block.Upload(ctx, log.NewNopLogger(), bkt, filepath.Join(tmpDir, id.String()), metadata.NoneFunc))
Expand Down
30 changes: 15 additions & 15 deletions pkg/block/indexheader/lazy_binary_reader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ func TestNewLazyBinaryReader_ShouldBuildIndexHeaderFromBucket(t *testing.T) {
t.Run(fmt.Sprintf("lazyDownload=%v", lazyDownload), func(t *testing.T) {
// Create block.
blockID, err := e2eutil.CreateBlock(ctx, tmpDir, []labels.Labels{
{{Name: "a", Value: "1"}},
{{Name: "a", Value: "2"}},
}, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "1"}}, 124, metadata.NoneFunc)
labels.FromStrings("a", "1"),
labels.FromStrings("a", "2"),
}, 100, 0, 1000, labels.FromStrings("ext1", "1"), 124, metadata.NoneFunc)
testutil.Ok(t, err)
testutil.Ok(t, block.Upload(ctx, log.NewNopLogger(), bkt, filepath.Join(tmpDir, blockID.String()), metadata.NoneFunc))

Expand Down Expand Up @@ -112,9 +112,9 @@ func TestNewLazyBinaryReader_ShouldRebuildCorruptedIndexHeader(t *testing.T) {

// Create block.
blockID, err := e2eutil.CreateBlock(ctx, tmpDir, []labels.Labels{
{{Name: "a", Value: "1"}},
{{Name: "a", Value: "2"}},
}, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "1"}}, 124, metadata.NoneFunc)
labels.FromStrings("a", "1"),
labels.FromStrings("a", "2"),
}, 100, 0, 1000, labels.FromStrings("ext1", "1"), 124, metadata.NoneFunc)
testutil.Ok(t, err)
testutil.Ok(t, block.Upload(ctx, log.NewNopLogger(), bkt, filepath.Join(tmpDir, blockID.String()), metadata.NoneFunc))

Expand Down Expand Up @@ -155,9 +155,9 @@ func TestLazyBinaryReader_ShouldReopenOnUsageAfterClose(t *testing.T) {

// Create block.
blockID, err := e2eutil.CreateBlock(ctx, tmpDir, []labels.Labels{
{{Name: "a", Value: "1"}},
{{Name: "a", Value: "2"}},
}, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "1"}}, 124, metadata.NoneFunc)
labels.FromStrings("a", "1"),
labels.FromStrings("a", "2"),
}, 100, 0, 1000, labels.FromStrings("ext1", "1"), 124, metadata.NoneFunc)
testutil.Ok(t, err)
testutil.Ok(t, block.Upload(ctx, log.NewNopLogger(), bkt, filepath.Join(tmpDir, blockID.String()), metadata.NoneFunc))

Expand Down Expand Up @@ -210,9 +210,9 @@ func TestLazyBinaryReader_unload_ShouldReturnErrorIfNotIdle(t *testing.T) {

// Create block.
blockID, err := e2eutil.CreateBlock(ctx, tmpDir, []labels.Labels{
{{Name: "a", Value: "1"}},
{{Name: "a", Value: "2"}},
}, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "1"}}, 124, metadata.NoneFunc)
labels.FromStrings("a", "1"),
labels.FromStrings("a", "2"),
}, 100, 0, 1000, labels.FromStrings("ext1", "1"), 124, metadata.NoneFunc)
testutil.Ok(t, err)
testutil.Ok(t, block.Upload(ctx, log.NewNopLogger(), bkt, filepath.Join(tmpDir, blockID.String()), metadata.NoneFunc))

Expand Down Expand Up @@ -264,9 +264,9 @@ func TestLazyBinaryReader_LoadUnloadRaceCondition(t *testing.T) {

// Create block.
blockID, err := e2eutil.CreateBlock(ctx, tmpDir, []labels.Labels{
{{Name: "a", Value: "1"}},
{{Name: "a", Value: "2"}},
}, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "1"}}, 124, metadata.NoneFunc)
labels.FromStrings("a", "1"),
labels.FromStrings("a", "2"),
}, 100, 0, 1000, labels.FromStrings("ext1", "1"), 124, metadata.NoneFunc)
testutil.Ok(t, err)
testutil.Ok(t, block.Upload(ctx, log.NewNopLogger(), bkt, filepath.Join(tmpDir, blockID.String()), metadata.NoneFunc))

Expand Down
12 changes: 6 additions & 6 deletions pkg/block/indexheader/reader_pool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ func TestReaderPool_NewBinaryReader(t *testing.T) {

// Create block.
blockID, err := e2eutil.CreateBlock(ctx, tmpDir, []labels.Labels{
{{Name: "a", Value: "1"}},
{{Name: "a", Value: "2"}},
}, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "1"}}, 124, metadata.NoneFunc)
labels.FromStrings("a", "1"),
labels.FromStrings("a", "2"),
}, 100, 0, 1000, labels.FromStrings("ext1", "1"), 124, metadata.NoneFunc)
testutil.Ok(t, err)
testutil.Ok(t, block.Upload(ctx, log.NewNopLogger(), bkt, filepath.Join(tmpDir, blockID.String()), metadata.NoneFunc))

Expand Down Expand Up @@ -87,9 +87,9 @@ func TestReaderPool_ShouldCloseIdleLazyReaders(t *testing.T) {

// Create block.
blockID, err := e2eutil.CreateBlock(ctx, tmpDir, []labels.Labels{
{{Name: "a", Value: "1"}},
{{Name: "a", Value: "2"}},
}, 100, 0, 1000, labels.Labels{{Name: "ext1", Value: "1"}}, 124, metadata.NoneFunc)
labels.FromStrings("a", "1"),
labels.FromStrings("a", "2"),
}, 100, 0, 1000, labels.FromStrings("ext1", "1"), 124, metadata.NoneFunc)
testutil.Ok(t, err)
testutil.Ok(t, block.Upload(ctx, log.NewNopLogger(), bkt, filepath.Join(tmpDir, blockID.String()), metadata.NoneFunc))
meta, err := metadata.ReadFromDir(filepath.Join(tmpDir, blockID.String()))
Expand Down
Loading

0 comments on commit 2ae647f

Please sign in to comment.