Fixing CR comments

Signed-off-by: Pedro Tanaka <[email protected]>

cmd/thanos/query_frontend.go

@@ -81,7 +81,7 @@ func registerQueryFrontend(app *extkingpin.App) {
 		"One should also set query-range.split-min-horizontal-shards to a value greater than 1 to enable splitting.").
 		Default("0").DurationVar(&cfg.QueryRangeConfig.MinQuerySplitInterval)
 
-	cmd.Flag("query-range.max-split-interval", "Split query range bellow this interval in query-range.horizontal-shards. Queries with a range longer than this value will be split in multiple requests of this length.").
+	cmd.Flag("query-range.max-split-interval", "Split query range below this interval in query-range.horizontal-shards. Queries with a range longer than this value will be split in multiple requests of this length.").
 		Default("0").DurationVar(&cfg.QueryRangeConfig.MaxQuerySplitInterval)
 
 	cmd.Flag("query-range.horizontal-shards", "Split queries in this many requests when query duration is below query-range.max-split-interval.").

docs/components/query-frontend.md

@@ -295,7 +295,7 @@ Flags:
                                  range request; beyond this, the downstream
                                  error is returned.
       --query-range.max-split-interval=0
-                                 Split query range bellow this interval in
+                                 Split query range below this interval in
                                  query-range.horizontal-shards. Queries with a
                                  range longer than this value will be split in
                                  multiple requests of this length.

pkg/queryfrontend/config.go

@@ -246,7 +246,7 @@ type LabelsConfig struct {
 func (cfg *Config) Validate() error {
 	if cfg.QueryRangeConfig.ResultsCacheConfig != nil {
 		if cfg.QueryRangeConfig.SplitQueriesByInterval <= 0 && !cfg.isDynamicSplitSet() {
-			return errors.New("split queries  or split threshold interval should be greater than 0 when caching is enabled")
+			return errors.New("split queries or split threshold interval should be greater than 0 when caching is enabled")
 		}
 		if err := cfg.QueryRangeConfig.ResultsCacheConfig.Validate(querier.Config{}); err != nil {
 			return errors.Wrap(err, "invalid ResultsCache config for query_range tripperware")
@@ -258,8 +258,8 @@ func (cfg *Config) Validate() error {
 	}
 
 	if cfg.isDynamicSplitSet() {
-		err := cfg.validateDynamicSplitParams()
-		if err != nil {
+
+		if err := cfg.validateDynamicSplitParams(); err != nil {
 			return err
 		}
 	}

pkg/queryfrontend/roundtrip.go

@@ -243,12 +243,12 @@ func dynamicIntervalFn(config QueryRangeConfig) queryrange.IntervalFn {
 		}
 
 		queryInterval := time.Duration(r.GetEnd()-r.GetStart()) * time.Millisecond
-		// if the query is multiple of max interval, we use the max interval to split.
+		// If the query is multiple of max interval, we use the max interval to split.
 		if queryInterval/config.MaxQuerySplitInterval >= 2 {
 			return config.MaxQuerySplitInterval
 		}
 
-		// if the query duration is less than max interval, we split it equally in HorizontalShards.
+		// If the query duration is less than max interval, we split it equally in HorizontalShards.
 		return time.Duration(queryInterval.Milliseconds()/config.HorizontalShards) * time.Millisecond
 	}
 }

pkg/queryfrontend/roundtrip_test.go

@@ -305,14 +305,6 @@ func TestRoundTripSplitIntervalMiddleware(t *testing.T) {
 			minHorizontalShards: 4,
 			expected:            2,
 		},
-		{
-			name:          "split to 2 requests, due to split interval",
-			req:           testRequest,
-			handlerFunc:   promqlResults,
-			codec:         queryRangeCodec,
-			splitInterval: 1 * time.Hour,
-			expected:      2,
-		},
 		{
 			name:          "labels request won't be split",
 			req:           testLabelsRequest,