fix import files lint error

Signed-off-by: rubywtl <[email protected]>

Author: rubywtl

pkg/querier/tripperware/distributed_query.go

@@ -63,8 +63,6 @@ func (d distributedQueryMiddleware) newLogicalPlan(qs string, start time.Time, e
 	logicalPlan := logicalplan.NewFromAST(expr, &qOpts, planOpts)
 	optimizedPlan, _ := logicalPlan.Optimize(logicalplan.DefaultOptimizers)
 
-	//TODO: Add distributed query optimizer
-
 	return &optimizedPlan, nil
 }
 

pkg/querier/tripperware/instantquery/instant_query_middlewares.go

@@ -3,10 +3,9 @@ package instantquery
 import (
 	"time"
 
+	"github.com/cortexproject/cortex/pkg/querier/tripperware"
 	"github.com/go-kit/log"
 	"github.com/thanos-io/thanos/pkg/querysharding"
-
-	"github.com/cortexproject/cortex/pkg/querier/tripperware"
 )
 
 func Middlewares(

pkg/querier/tripperware/instantquery/instant_query_middlewares_test.go

@@ -10,15 +10,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cortexproject/cortex/pkg/querier/tripperware"
+	"github.com/cortexproject/cortex/pkg/util/validation"
 	"github.com/go-kit/log"
 	"github.com/stretchr/testify/require"
+	"github.com/thanos-io/promql-engine/logicalplan"
 	"github.com/thanos-io/thanos/pkg/querysharding"
 	"github.com/weaveworks/common/middleware"
 	"github.com/weaveworks/common/user"
-
-	"github.com/cortexproject/cortex/pkg/querier/tripperware"
-	"github.com/cortexproject/cortex/pkg/util/validation"
-	"github.com/thanos-io/promql-engine/logicalplan"
 )
 
 const (

pkg/querier/tripperware/queryrange/query_range.go

@@ -3,7 +3,6 @@ package queryrange
 import (
 	"bytes"
 	"context"
-	"github.com/thanos-io/promql-engine/logicalplan"
 	"io"
 	"net/http"
 	"net/url"
@@ -24,6 +23,7 @@ import (
 
 	"github.com/cortexproject/cortex/pkg/util/limiter"
 	"github.com/cortexproject/cortex/pkg/util/spanlogger"
+	"github.com/thanos-io/promql-engine/logicalplan"
 )
 
 // StatusSuccess Prometheus success result.

pkg/querier/tripperware/queryrange/query_range_middlewares_test.go

@@ -2,7 +2,6 @@ package queryrange
 
 import (
 	"context"
-	"github.com/thanos-io/promql-engine/logicalplan"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -11,14 +10,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cortexproject/cortex/pkg/querier/tripperware"
+	"github.com/cortexproject/cortex/pkg/util/validation"
 	"github.com/go-kit/log"
 	"github.com/stretchr/testify/require"
+	"github.com/thanos-io/promql-engine/logicalplan"
 	"github.com/thanos-io/thanos/pkg/querysharding"
 	"github.com/weaveworks/common/middleware"
 	"github.com/weaveworks/common/user"
-
-	"github.com/cortexproject/cortex/pkg/querier/tripperware"
-	"github.com/cortexproject/cortex/pkg/util/validation"
 )
 
 var (