From d7134e50d041858c714963c19bed51bca7bc8ec9 Mon Sep 17 00:00:00 2001 From: yeya24 Date: Fri, 6 Jun 2025 11:52:52 -0700 Subject: [PATCH 1/2] disable topk and bottomk aggregation in query fuzz test Signed-off-by: yeya24 --- integration/query_fuzz_test.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/integration/query_fuzz_test.go b/integration/query_fuzz_test.go index f31f061cf0d..fba83b58a8e 100644 --- a/integration/query_fuzz_test.go +++ b/integration/query_fuzz_test.go @@ -38,7 +38,12 @@ import ( "github.com/cortexproject/cortex/pkg/util/log" ) -var enabledFunctions []*parser.Function +var ( + enabledFunctions []*parser.Function + enabledAggrs []parser.ItemType = []parser.ItemType{ + parser.SUM, parser.MIN, parser.MAX, parser.AVG, parser.GROUP, parser.COUNT, parser.COUNT_VALUES, parser.QUANTILE, + } +) func init() { for _, f := range parser.Functions { @@ -153,9 +158,7 @@ func TestNativeHistogramFuzz(t *testing.T) { opts := []promqlsmith.Option{ promqlsmith.WithEnableOffset(true), promqlsmith.WithEnableAtModifier(true), - promqlsmith.WithEnabledAggrs([]parser.ItemType{ - parser.SUM, parser.MIN, parser.MAX, parser.AVG, parser.GROUP, parser.COUNT, parser.COUNT_VALUES, parser.QUANTILE, - }), + promqlsmith.WithEnabledAggrs(enabledAggrs), } ps := promqlsmith.New(rnd, lbls, opts...) @@ -271,6 +274,7 @@ func TestExperimentalPromQLFuncsWithPrometheus(t *testing.T) { promqlsmith.WithEnableOffset(true), promqlsmith.WithEnableAtModifier(true), promqlsmith.WithEnabledFunctions(enabledFunctions), + promqlsmith.WithEnabledAggrs(enabledAggrs), promqlsmith.WithEnableExperimentalPromQLFunctions(true), } ps := promqlsmith.New(rnd, lbls, opts...) @@ -376,6 +380,7 @@ func TestDisableChunkTrimmingFuzz(t *testing.T) { promqlsmith.WithEnableOffset(true), promqlsmith.WithEnableAtModifier(true), promqlsmith.WithEnabledFunctions(enabledFunctions), + promqlsmith.WithEnabledAggrs(enabledAggrs), } ps := promqlsmith.New(rnd, lbls, opts...) @@ -558,6 +563,7 @@ func TestExpandedPostingsCacheFuzz(t *testing.T) { opts := []promqlsmith.Option{ promqlsmith.WithEnableOffset(true), promqlsmith.WithEnableAtModifier(true), + promqlsmith.WithEnabledAggrs(enabledAggrs), } ps := promqlsmith.New(rnd, lbls, opts...) @@ -788,6 +794,7 @@ func TestVerticalShardingFuzz(t *testing.T) { promqlsmith.WithEnableOffset(true), promqlsmith.WithEnableAtModifier(true), promqlsmith.WithEnabledFunctions(enabledFunctions), + promqlsmith.WithEnabledAggrs(enabledAggrs), } ps := promqlsmith.New(rnd, lbls, opts...) @@ -904,6 +911,7 @@ func TestProtobufCodecFuzz(t *testing.T) { promqlsmith.WithEnableOffset(true), promqlsmith.WithEnableAtModifier(true), promqlsmith.WithEnabledFunctions(enabledFunctions), + promqlsmith.WithEnabledAggrs(enabledAggrs), } ps := promqlsmith.New(rnd, lbls, opts...) @@ -1600,6 +1608,7 @@ func TestBackwardCompatibilityQueryFuzz(t *testing.T) { promqlsmith.WithEnableOffset(true), promqlsmith.WithEnableAtModifier(true), promqlsmith.WithEnabledFunctions(enabledFunctions), + promqlsmith.WithEnabledAggrs(enabledAggrs), } ps := promqlsmith.New(rnd, lbls, opts...) @@ -1712,6 +1721,7 @@ func TestPrometheusCompatibilityQueryFuzz(t *testing.T) { promqlsmith.WithEnableOffset(true), promqlsmith.WithEnableAtModifier(true), promqlsmith.WithEnabledFunctions(enabledFunctions), + promqlsmith.WithEnabledAggrs(enabledAggrs), } ps := promqlsmith.New(rnd, lbls, opts...) From ea3ea48394ffaa228b52ddf413f7a28aebe975ac Mon Sep 17 00:00:00 2001 From: yeya24 Date: Fri, 6 Jun 2025 11:54:26 -0700 Subject: [PATCH 2/2] lint Signed-off-by: yeya24 --- integration/query_fuzz_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/query_fuzz_test.go b/integration/query_fuzz_test.go index fba83b58a8e..96723dba0e8 100644 --- a/integration/query_fuzz_test.go +++ b/integration/query_fuzz_test.go @@ -40,7 +40,7 @@ import ( var ( enabledFunctions []*parser.Function - enabledAggrs []parser.ItemType = []parser.ItemType{ + enabledAggrs = []parser.ItemType{ parser.SUM, parser.MIN, parser.MAX, parser.AVG, parser.GROUP, parser.COUNT, parser.COUNT_VALUES, parser.QUANTILE, } )