fix merge conflict

go.sum

@@ -716,8 +716,6 @@ github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75 h1:cA+Ubq9qEVI
 github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
-github.com/sandeepsukhani/cortex v0.0.0-20200401102156-8377099831f7 h1:yoacVlbP2nrspG+JX4fnzPQVQJia0fYq283Kfb+59zE=
-github.com/sandeepsukhani/cortex v0.0.0-20200401102156-8377099831f7/go.mod h1:dMuT8RuWexf371937IhTj7/Ha3P/+Aog3pddNtV6Jo0=
 github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4=
 github.com/satori/go.uuid v0.0.0-20160603004225-b111a074d5ef/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=

pkg/ingester/ingester.go

@@ -22,8 +22,12 @@ import (
 	"github.com/cortexproject/cortex/pkg/util/services"
 
 	"github.com/grafana/loki/pkg/chunkenc"
+	"github.com/grafana/loki/pkg/helpers"
 	"github.com/grafana/loki/pkg/ingester/client"
+	"github.com/grafana/loki/pkg/iter"
 	"github.com/grafana/loki/pkg/logproto"
+	"github.com/grafana/loki/pkg/logql"
+	"github.com/grafana/loki/pkg/logql/stats"
 	"github.com/grafana/loki/pkg/util/validation"
 )
 

pkg/storage/store.go

@@ -17,7 +17,6 @@ import (
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/logql"
 	"github.com/grafana/loki/pkg/logql/stats"
-	"github.com/grafana/loki/pkg/storage/stores"
 	"github.com/grafana/loki/pkg/storage/stores/local"
 	"github.com/grafana/loki/pkg/util"
 )
@@ -220,7 +219,7 @@ func filterChunksByTime(from, through model.Time, chunks []chunk.Chunk) []chunk.
 
 func registerCustomIndexClients(cfg Config, schemaCfg chunk.SchemaConfig) {
 	boltdbShipperInstances := 0
-	storage.RegisterIndexClient(local.BoltDBShipperType, func() (chunk.IndexClient, error) {
+	storage.RegisterIndexStore(local.BoltDBShipperType, func() (chunk.IndexClient, error) {
 		// since we do not know which object client is being used for the period for which we are creating this index client,
 		// we need to iterate through all the periodic configs to find the right one.
 		// We maintain number of instances that we have already created in boltdbShipperInstances and then count the number of
@@ -242,11 +241,11 @@ func registerCustomIndexClients(cfg Config, schemaCfg chunk.SchemaConfig) {
 		}
 
 		boltdbShipperInstances++
-		objectClient, err := stores.NewObjectClient(objectStoreType, cfg.Config)
+		objectClient, err := storage.NewObjectClient(objectStoreType, cfg.Config)
 		if err != nil {
 			return nil, err
 		}
 
 		return local.NewBoltDBIndexClient(cortex_local.BoltDBConfig{Directory: cfg.BoltDBShipperConfig.ActiveIndexDirectory}, objectClient, cfg.BoltDBShipperConfig)
-	})
+	}, nil)
 }