Try fix acceptance test failures

Signed-off-by: Giedrius Statkevičius <[email protected]>

Author: harry671003

engine/engine_test.go

@@ -2238,6 +2238,13 @@ avg by (storage_info) (
 			start: time.UnixMilli(170000),
 			end:   time.UnixMilli(170000),
 		},
+		{
+			name: "predict_linear",
+			load: `load 1m
+			    native_histogram {{sum:100 count:100}} {{sum:103 count:103}} {{sum:106 count:106}} {{sum:109 count:109}} {{sum:112 count:112}} {{sum:3 count:3 counter_reset_hint:reset}} {{sum:6 count:6}}+{{sum:3 count:3}}x5`,
+			query: `increase(native_histogram[10m:3m])`,
+			start: time.UnixMilli(10 * 60 * 1000),
+		},
 	}
 
 	disableOptimizerOpts := []bool{true, false}

execution/aggregate/count_values.go

@@ -11,13 +11,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/efficientgo/core/errors"
-	prommodel "github.com/prometheus/common/model"
-	"github.com/prometheus/prometheus/model/labels"
-
 	"github.com/thanos-io/promql-engine/execution/model"
 	"github.com/thanos-io/promql-engine/execution/telemetry"
 	"github.com/thanos-io/promql-engine/query"
+
+	"github.com/efficientgo/core/errors"
+	prommodel "github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/model/labels"
 )
 
 type countValuesOperator struct {

execution/scan/subquery.go

@@ -257,7 +257,7 @@ func (o *subqueryOperator) initSeries(ctx context.Context) error {
 		o.series = make([]labels.Labels, len(series))
 		o.buffers = make([]*ringbuffer.GenericRingBuffer, len(series))
 		for i := range o.buffers {
-			o.buffers[i] = ringbuffer.New(ctx, 8, o.subQuery.Range.Milliseconds(), o.subQuery.Offset.Milliseconds(), o.call)
+			o.buffers[i] = ringbuffer.New(ctx, 8, o.subQuery.Range.Milliseconds(), o.subQuery.Offset.Milliseconds(), o.call, true)
 		}
 		var b labels.ScratchBuilder
 		for i, s := range series {

ringbuffer/generic.go

@@ -21,9 +21,10 @@ type Sample struct {
 }
 
 type GenericRingBuffer struct {
-	ctx   context.Context
-	items []Sample
-	tail  []Sample
+	ctx      context.Context
+	items    []Sample
+	tail     []Sample
+	subquery bool
 
 	currentStep int64
 	offset      int64
@@ -32,18 +33,19 @@ type GenericRingBuffer struct {
 	call        FunctionCall
 }
 
-func New(ctx context.Context, size int, selectRange, offset int64, call FunctionCall) *GenericRingBuffer {
-	return NewWithExtLookback(ctx, size, selectRange, offset, 0, call)
+func New(ctx context.Context, size int, selectRange, offset int64, call FunctionCall, subquery bool) *GenericRingBuffer {
+	return NewWithExtLookback(ctx, size, selectRange, offset, 0, call, subquery)
 }
 
-func NewWithExtLookback(ctx context.Context, size int, selectRange, offset, extLookback int64, call FunctionCall) *GenericRingBuffer {
+func NewWithExtLookback(ctx context.Context, size int, selectRange, offset, extLookback int64, call FunctionCall, subquery bool) *GenericRingBuffer {
 	return &GenericRingBuffer{
 		ctx:         ctx,
 		items:       make([]Sample, 0, size),
 		selectRange: selectRange,
 		offset:      offset,
 		extLookback: extLookback,
 		call:        call,
+		subquery:    subquery,
 	}
 }
 
@@ -76,7 +78,29 @@ func (r *GenericRingBuffer) Push(t int64, v Value) {
 	r.items[n].V.F = v.F
 	if v.H != nil {
 		if r.items[n].V.H == nil {
-			r.items[n].V.H = v.H.Copy()
+			h := v.H.Copy()
+			if r.subquery {
+				// Set any "NotCounterReset" and "CounterReset" hints in native
+				// histograms to "UnknownCounterReset" because we might
+				// otherwise miss a counter reset happening in samples not
+				// returned by the subquery, or we might over-detect counter
+				// resets if the sample with a counter reset is returned
+				// multiple times by a high-res subquery. This intentionally
+				// does not attempt to be clever (like detecting if we are
+				// really missing underlying samples or returning underlying
+				// samples multiple times) because subqueries on counters are
+				// inherently problematic WRT counter reset handling, so we
+				// cannot really solve the problem for good. We only want to
+				// avoid problems that happen due to the explicitly set counter
+				// reset hints and go back to the behavior we already know from
+				// float samples.
+				switch h.CounterResetHint {
+				case histogram.NotCounterReset, histogram.CounterReset:
+					h.CounterResetHint = histogram.UnknownCounterReset
+				}
+			}
+			r.items[n].V.H = h
+
 		} else {
 			v.H.CopyTo(r.items[n].V.H)
 		}

storage/prometheus/matrix_selector.go

@@ -287,9 +287,9 @@ func (o *matrixSelector) newBuffer(ctx context.Context) ringbuffer.Buffer {
 	}
 
 	if o.isExtFunction {
-		return ringbuffer.NewWithExtLookback(ctx, 8, o.selectRange, o.offset, o.opts.ExtLookbackDelta.Milliseconds()-1, o.call)
+		return ringbuffer.NewWithExtLookback(ctx, 8, o.selectRange, o.offset, o.opts.ExtLookbackDelta.Milliseconds()-1, o.call, false)
 	}
-	return ringbuffer.New(ctx, 8, o.selectRange, o.offset, o.call)
+	return ringbuffer.New(ctx, 8, o.selectRange, o.offset, o.call, false)
 
 }