Implement Native histogram Binary operations and Change Functions for Compatibility with v3.1.0

.github/workflows/test.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main, prometheus-update-65f610353919 ]
+    branches: [ main, update-prometheus-3.0 ]
 
 jobs:
   skip-check:

engine/engine.go

@@ -653,6 +653,9 @@ loop:
 			}
 		}
 		sort.Slice(vector, q.resultSort.comparer(&vector))
+		if vector.ContainsSameLabelset() {
+			return newErrResult(ret, extlabels.ErrDuplicateLabelSet)
+		}
 		result = vector
 	case parser.ValueTypeScalar:
 		v := math.NaN()

engine/engine_test.go

@@ -65,6 +65,7 @@ func TestPromqlAcceptance(t *testing.T) {
 
 	engine := engine.New(engine.Opts{
 		EngineOpts: promql.EngineOpts{
+			Logger:                   promslog.NewNopLogger(),
 			EnableAtModifier:         true,
 			EnableNegativeOffset:     true,
 			MaxSamples:               5e10,
@@ -5148,25 +5149,25 @@ func TestEngineRecoversFromPanic(t *testing.T) {
 func TestNativeHistogramRateWithNaN(t *testing.T) {
 	type HPoint struct {
 		T int64
-		H *histogram.Histogram
+		H *histogram.FloatHistogram
 	}
 
 	testStorage := teststorage.New(t)
 	defer testStorage.Close()
 
 	app := testStorage.Appender(context.TODO())
 	points := []HPoint{
-		{T: 5574708, H: tsdbutil.GenerateTestHistogram(1)},
-		{T: 5604708, H: tsdbutil.GenerateTestHistogram(2)},
-		{T: 5634708, H: tsdbutil.GenerateTestHistogram(3)},
-
-		{T: 6146221, H: &histogram.Histogram{Sum: math.NaN()}},
-		{T: 6176221, H: tsdbutil.GenerateTestHistogram(1)},
-		{T: 6206221, H: tsdbutil.GenerateTestHistogram(1)},
-		{T: 6236221, H: tsdbutil.GenerateTestHistogram(1)},
+		{T: 5574708, H: tsdbutil.GenerateTestFloatHistogram(1)},
+		{T: 5604708, H: tsdbutil.GenerateTestFloatHistogram(2)},
+		{T: 5634708, H: tsdbutil.GenerateTestFloatHistogram(3)},
+
+		{T: 6146221, H: &histogram.FloatHistogram{Sum: math.NaN()}},
+		{T: 6176221, H: tsdbutil.GenerateTestFloatHistogram(1)},
+		{T: 6206221, H: tsdbutil.GenerateTestFloatHistogram(1)},
+		{T: 6236221, H: tsdbutil.GenerateTestFloatHistogram(1)},
 	}
 	for _, point := range points {
-		_, err := app.AppendHistogram(0, labels.FromStrings(labels.MetricName, "test_metric"), point.T, point.H, nil)
+		_, err := app.AppendHistogram(0, labels.FromStrings(labels.MetricName, "test_metric"), point.T, nil, point.H)
 		require.NoError(t, err)
 	}
 	require.NoError(t, app.Commit())

engine/enginefuzz_test.go

@@ -15,13 +15,14 @@ import (
 	"github.com/efficientgo/core/errors"
 	"github.com/efficientgo/core/testutil"
 	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/require"
+
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/prometheus/prometheus/promql/promqltest"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/util/teststorage"
-	"github.com/stretchr/testify/require"
 
 	"github.com/thanos-io/promql-engine/api"
 	"github.com/thanos-io/promql-engine/engine"