Fix the build after conflict resolution

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

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)

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(),