remove utils folder

Signed-off-by: Ben Ye <benye@amazon.com>

Author: yeya24

pkg/querier/tripperware/instantquery/instant_query.go

@@ -24,7 +24,6 @@ import (
 	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/cortexproject/cortex/pkg/querier/tripperware"
 	"github.com/cortexproject/cortex/pkg/querier/tripperware/queryrange"
-	"github.com/cortexproject/cortex/pkg/querier/tripperware/utils"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/spanlogger"
 )
@@ -364,7 +363,7 @@ func matrixMerge(resps []*PrometheusInstantQueryResponse) *Matrix {
 					stream.Samples = stream.Samples[1:]
 				} else if existingEndTs > stream.Samples[0].TimestampMs {
 					// Overlap might be big, use heavier algorithm to remove overlap.
-					stream.Samples = utils.SliceSamples(stream.Samples, existingEndTs)
+					stream.Samples = tripperware.SliceSamples(stream.Samples, existingEndTs)
 				} // else there is no overlap, yay!
 			}
 			existing.Samples = append(existing.Samples, stream.Samples...)

pkg/querier/tripperware/instantquery/instantquery.proto

@@ -44,5 +44,5 @@ message Sample {
 }
 
 message Matrix {
-  repeated tripperware.SampleStream sampleStreams = 1;
+  repeated tripperware.SampleStream sampleStreams = 1 [(gogoproto.nullable) = false];
 }

pkg/querier/tripperware/queryrange/query_range.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/cortexproject/cortex/pkg/querier/tripperware"
-	"github.com/cortexproject/cortex/pkg/querier/tripperware/utils"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/spanlogger"
 )
@@ -366,7 +365,7 @@ func matrixMerge(resps []*PrometheusResponse) []tripperware.SampleStream {
 					stream.Samples = stream.Samples[1:]
 				} else if existingEndTs > stream.Samples[0].TimestampMs {
 					// Overlap might be big, use heavier algorithm to remove overlap.
-					stream.Samples = utils.SliceSamples(stream.Samples, existingEndTs)
+					stream.Samples = tripperware.SliceSamples(stream.Samples, existingEndTs)
 				} // else there is no overlap, yay!
 			}
 			existing.Samples = append(existing.Samples, stream.Samples...)

pkg/querier/tripperware/util.go

@@ -2,7 +2,9 @@ package tripperware
 
 import (
 	"context"
+	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"net/http"
+	"sort"
 
 	"github.com/weaveworks/common/httpgrpc"
 
@@ -70,3 +72,23 @@ func DoRequests(ctx context.Context, downstream Handler, reqs []Request, limits
 
 	return resps, firstErr
 }
+
+// SliceSamples assumes given samples are sorted by timestamp in ascending order and
+// return a sub slice whose first element's is the smallest timestamp that is strictly
+// bigger than the given minTs. Empty slice is returned if minTs is bigger than all the
+// timestamps in samples.
+func SliceSamples(samples []cortexpb.Sample, minTs int64) []cortexpb.Sample {
+	if len(samples) <= 0 || minTs < samples[0].TimestampMs {
+		return samples
+	}
+
+	if len(samples) > 0 && minTs > samples[len(samples)-1].TimestampMs {
+		return samples[len(samples):]
+	}
+
+	searchResult := sort.Search(len(samples), func(i int) bool {
+		return samples[i].TimestampMs > minTs
+	})
+
+	return samples[searchResult:]
+}