fixes merge conflicts

Signed-off-by: Owen Diehl <[email protected]>

Author: owen-d

pkg/querier/block.go

@@ -18,6 +18,7 @@ import (
 	"github.com/weaveworks/common/user"
 	"google.golang.org/grpc/metadata"
 
+	"github.com/cortexproject/cortex/pkg/querier/series"
 	"github.com/cortexproject/cortex/pkg/storage/tsdb"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/spanlogger"
@@ -244,15 +245,15 @@ func (bqs *blockQuerierSeries) Labels() labels.Labels {
 func (bqs *blockQuerierSeries) Iterator() storage.SeriesIterator {
 	if len(bqs.chunks) == 0 {
 		// should not happen in practice, but we have a unit test for it
-		return errIterator{err: errors.New("no chunks")}
+		return series.NewErrIterator(errors.New("no chunks"))
 	}
 
 	its := make([]chunkenc.Iterator, 0, len(bqs.chunks))
 
 	for _, c := range bqs.chunks {
 		ch, err := chunkenc.FromData(chunkenc.EncXOR, c.Raw.Data)
 		if err != nil {
-			return errIterator{err: errors.Wrapf(err, "failed to initialize chunk from XOR encoded raw data (series: %v min time: %d max time: %d)", bqs.Labels(), c.MinTime, c.MaxTime)}
+			return series.NewErrIterator(errors.Wrapf(err, "failed to initialize chunk from XOR encoded raw data (series: %v min time: %d max time: %d)", bqs.Labels(), c.MinTime, c.MaxTime))
 		}
 
 		it := ch.Iterator(nil)

pkg/querier/distributor_queryable.go

@@ -55,7 +55,7 @@ func (q *distributorQuerier) Select(sp *storage.SelectParams, matchers ...*label
 		if err != nil {
 			return nil, nil, err
 		}
-		return metricsToSeriesSet(ms), nil, nil
+		return series.MetricsToSeriesSet(ms), nil, nil
 	}
 
 	mint, maxt := sp.Start, sp.End
@@ -108,7 +108,7 @@ func (q *distributorQuerier) streamingSelect(sp storage.SelectParams, matchers [
 		serieses = append(serieses, series)
 	}
 
-	return newConcreteSeriesSet(serieses), nil, nil
+	return series.NewConcreteSeriesSet(serieses), nil, nil
 }
 
 func (q *distributorQuerier) LabelValues(name string) ([]string, storage.Warnings, error) {

pkg/querier/lazyquery/lazyquery.go

@@ -86,6 +86,10 @@ func (l LazyQuerier) Get(ctx context.Context, userID string, from, through model
 	return store.Get(ctx, userID, from, through, matchers...)
 }
 
+func NewErrSeriesSet(err error) storage.SeriesSet {
+	return errSeriesSet{err}
+}
+
 // errSeriesSet implements storage.SeriesSet, just returning an error.
 type errSeriesSet struct {
 	err error

pkg/querier/querier.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/cortexproject/cortex/pkg/chunk"
 	"github.com/cortexproject/cortex/pkg/querier/batch"
+	"github.com/cortexproject/cortex/pkg/querier/chunkstore"
 	"github.com/cortexproject/cortex/pkg/querier/iterators"
 	"github.com/cortexproject/cortex/pkg/querier/lazyquery"
 	"github.com/cortexproject/cortex/pkg/util"
@@ -84,7 +85,7 @@ func getChunksIteratorFunction(cfg Config) chunkIteratorFunc {
 	return mergeChunks
 }
 
-func NewChunkStoreQueryable(cfg Config, chunkStore ChunkStore) storage.Queryable {
+func NewChunkStoreQueryable(cfg Config, chunkStore chunkstore.ChunkStore) storage.Queryable {
 	return newChunkStoreQueryable(chunkStore, getChunksIteratorFunction(cfg))
 }
 
@@ -234,7 +235,7 @@ func (q querier) mergeSeriesSets(sets []storage.SeriesSet) storage.SeriesSet {
 			// If there is error, we better report it.
 			err := set.Err()
 			if err != nil {
-				otherSets = append(otherSets, errSeriesSet{err: err})
+				otherSets = append(otherSets, lazyquery.NewErrSeriesSet(err))
 			}
 			continue
 		}