From 8ee4dfd40cf4cc65733a27129db235e347bd9eaf Mon Sep 17 00:00:00 2001 From: Ganesh Vernekar Date: Wed, 12 Oct 2022 17:59:42 +0530 Subject: [PATCH] Fix the build after conflict resolution Signed-off-by: Ganesh Vernekar --- tsdb/head_test.go | 4 ++-- tsdb/head_wal.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tsdb/head_test.go b/tsdb/head_test.go index 542e2303a..9b8eb0278 100644 --- a/tsdb/head_test.go +++ b/tsdb/head_test.go @@ -2923,7 +2923,7 @@ func TestHistogramInWALAndMmapChunk(t *testing.T) { // Restart head. require.NoError(t, head.Close()) - w, err := wal.NewSize(nil, nil, head.wal.Dir(), 32768, false) + w, err := wlog.NewSize(nil, nil, head.wal.Dir(), 32768, false) require.NoError(t, err) head, err = NewHead(nil, nil, w, nil, head.opts, nil) require.NoError(t, err) @@ -3267,7 +3267,7 @@ func TestHistogramMetrics(t *testing.T) { require.Equal(t, float64(expHSamples), prom_testutil.ToFloat64(head.metrics.samplesAppended.WithLabelValues(sampleMetricTypeHistogram))) require.NoError(t, head.Close()) - w, err := wal.NewSize(nil, nil, head.wal.Dir(), 32768, false) + w, err := wlog.NewSize(nil, nil, head.wal.Dir(), 32768, false) require.NoError(t, err) head, err = NewHead(nil, nil, w, nil, head.opts, nil) require.NoError(t, err) diff --git a/tsdb/head_wal.go b/tsdb/head_wal.go index 7628461e1..b0fa7eb29 100644 --- a/tsdb/head_wal.go +++ b/tsdb/head_wal.go @@ -204,7 +204,7 @@ func (h *Head) loadWAL(r *wlog.Reader, multiRef map[chunks.HeadSeriesRef]chunks. hists := histogramsPool.Get().([]record.RefHistogramSample)[:0] hists, err = dec.HistogramSamples(rec, hists) if err != nil { - decodeErr = &wal.CorruptionErr{ + decodeErr = &wlog.CorruptionErr{ Err: errors.Wrap(err, "decode histograms"), Segment: r.Segment(), Offset: r.Offset(),