@@ -397,7 +397,7 @@ func TestDisableChunkTrimmingFuzz(t *testing.T) {
397397 expr = ps .WalkRangeQuery ()
398398 query = expr .Pretty (0 )
399399 // timestamp is a known function that break with disable chunk trimming.
400- if isValidQuery (expr , 5 , false ) && ! strings .Contains (query , "timestamp" ) {
400+ if isValidQuery (expr , false ) && ! strings .Contains (query , "timestamp" ) {
401401 break
402402 }
403403 }
@@ -566,7 +566,7 @@ func TestExpandedPostingsCacheFuzz(t *testing.T) {
566566 matchers := make ([]string , 0 , testRun )
567567 for i := 0 ; i < testRun ; i ++ {
568568 expr := ps .WalkRangeQuery ()
569- if isValidQuery (expr , 5 , true ) {
569+ if isValidQuery (expr , true ) {
570570 break
571571 }
572572 queries = append (queries , expr .Pretty (0 ))
@@ -1731,7 +1731,7 @@ func runQueryFuzzTestCases(t *testing.T, ps *promqlsmith.PromQLSmith, c1, c2 *e2
17311731 for i := 0 ; i < run ; i ++ {
17321732 for {
17331733 expr = ps .WalkInstantQuery ()
1734- if isValidQuery (expr , 5 , skipStdAggregations ) {
1734+ if isValidQuery (expr , skipStdAggregations ) {
17351735 query = expr .Pretty (0 )
17361736 break
17371737 }
@@ -1752,7 +1752,7 @@ func runQueryFuzzTestCases(t *testing.T, ps *promqlsmith.PromQLSmith, c1, c2 *e2
17521752 for i := 0 ; i < run ; i ++ {
17531753 for {
17541754 expr = ps .WalkRangeQuery ()
1755- if isValidQuery (expr , 5 , skipStdAggregations ) {
1755+ if isValidQuery (expr , skipStdAggregations ) {
17561756 query = expr .Pretty (0 )
17571757 break
17581758 }
@@ -1803,9 +1803,8 @@ func shouldUseSampleNumComparer(query string) bool {
18031803 return false
18041804}
18051805
1806- func isValidQuery (generatedQuery parser.Expr , maxDepth int , skipStdAggregations bool ) bool {
1806+ func isValidQuery (generatedQuery parser.Expr , skipStdAggregations bool ) bool {
18071807 isValid := true
1808- currentDepth := 0
18091808 // TODO(SungJin1212): Test limitk, limit_ratio
18101809 if strings .Contains (generatedQuery .String (), "limitk" ) {
18111810 // current skip the limitk
@@ -1820,13 +1819,5 @@ func isValidQuery(generatedQuery parser.Expr, maxDepth int, skipStdAggregations
18201819 // If skipStdAggregations enabled, we skip to evaluate for stddev and stdvar aggregations.
18211820 return false
18221821 }
1823- parser .Inspect (generatedQuery , func (node parser.Node , path []parser.Node ) error {
1824- if currentDepth > maxDepth {
1825- isValid = false
1826- return fmt .Errorf ("generated query has exceeded maxDepth of %d" , maxDepth )
1827- }
1828- currentDepth = len (path ) + 1
1829- return nil
1830- })
18311822 return isValid
18321823}
0 commit comments