Refactor codes

* remove duplicate logic in instance
* format with goimport

pkg/ingester/index/index.go

@@ -150,19 +150,20 @@ func (ii *InvertedIndex) Lookup(matchers []*labels.Matcher, shard *astmapper.Sha
 
 	var result []model.Fingerprint
 	shards := ii.getShards(shard)
+
 	// if no matcher is specified, all fingerprints would be returned
 	if len(matchers) == 0 {
 		for i := range shards {
 			fps := shards[i].allFPs()
 			result = append(result, fps...)
 		}
-	} else {
-		for i := range shards {
-			fps := shards[i].lookup(matchers)
-			result = append(result, fps...)
-		}
+		return result, nil
 	}
 
+	for i := range shards {
+		fps := shards[i].lookup(matchers)
+		result = append(result, fps...)
+	}
 	return result, nil
 }
 

pkg/ingester/instance.go

@@ -310,17 +310,10 @@ func (i *instance) Query(ctx context.Context, req logql.SelectLogParams) ([]iter
 	ingStats := stats.GetIngesterData(ctx)
 	var iters []iter.EntryIterator
 
-	var shard *astmapper.ShardAnnotation
-	shards, err := logql.ParseShards(req.Shards)
+	shard, err := parseShardFromRequest(req.Shards)
 	if err != nil {
 		return nil, err
 	}
-	if len(shards) > 1 {
-		return nil, errors.New("only one shard per ingester query is supported")
-	}
-	if len(shards) == 1 {
-		shard = &shards[0]
-	}
 
 	err = i.forMatchingStreams(
 		ctx,
@@ -418,18 +411,10 @@ func (i *instance) Series(ctx context.Context, req *logproto.SeriesRequest) (*lo
 	if err != nil {
 		return nil, err
 	}
-
-	var shard *astmapper.ShardAnnotation
-	shards, err := logql.ParseShards(req.Shards)
+	shard, err := parseShardFromRequest(req.Shards)
 	if err != nil {
 		return nil, err
 	}
-	if len(shards) > 1 {
-		return nil, errors.New("only one shard per ingester query is supported")
-	}
-	if len(shards) == 1 {
-		shard = &shards[0]
-	}
 
 	var series []logproto.SeriesIdentifier
 
@@ -625,6 +610,21 @@ func (i *instance) openTailersCount() uint32 {
 	return uint32(len(i.tailers))
 }
 
+func parseShardFromRequest(reqShards []string) (*astmapper.ShardAnnotation, error) {
+	var shard *astmapper.ShardAnnotation
+	shards, err := logql.ParseShards(reqShards)
+	if err != nil {
+		return nil, err
+	}
+	if len(shards) > 1 {
+		return nil, errors.New("only one shard per ingester query is supported")
+	}
+	if len(shards) == 1 {
+		shard = &shards[0]
+	}
+	return shard, nil
+}
+
 func isDone(ctx context.Context) bool {
 	select {
 	case <-ctx.Done():

pkg/ingester/instance_test.go

@@ -3,14 +3,15 @@ package ingester
 import (
 	"context"
 	"fmt"
-	"github.com/cortexproject/cortex/pkg/querier/astmapper"
 	"math/rand"
 	"runtime"
 	"sort"
 	"sync"
 	"testing"
 	"time"
 
+	"github.com/cortexproject/cortex/pkg/querier/astmapper"
+
 	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/stretchr/testify/require"