all: get rid of query pushdown to simplify query path

Signed-off-by: Michael Hoffmann <[email protected]>
thanos-io · Dec 29, 2023 · ee0d357 · ee0d357
1 parent bd7accb
commit ee0d357
Show file tree

Hide file tree

Showing 20 changed files with 63 additions and 926 deletions.
diff --git a/cmd/thanos/query.go b/cmd/thanos/query.go
@@ -197,7 +197,7 @@ func registerQuery(app *extkingpin.App) {
 
 	activeQueryDir := cmd.Flag("query.active-query-path", "Directory to log currently active queries in the queries.active file.").Default("").String()
 
-	featureList := cmd.Flag("enable-feature", "Comma separated experimental feature names to enable.The current list of features is "+queryPushdown+".").Default("").Strings()
+	featureList := cmd.Flag("enable-feature", "Comma separated experimental feature names to enable.The current list of features is empty.").Default("").Strings()
 
 	enableExemplarPartialResponse := cmd.Flag("exemplar.partial-response", "Enable partial response for exemplar endpoint. --no-exemplar.partial-response for disabling.").
 		Hidden().Default("true").Bool()
@@ -230,17 +230,16 @@ func registerQuery(app *extkingpin.App) {
 			return errors.Wrap(err, "parse federation labels")
 		}
 
-		var enableQueryPushdown bool
 		for _, feature := range *featureList {
-			if feature == queryPushdown {
-				enableQueryPushdown = true
-			}
 			if feature == promqlAtModifier {
 				level.Warn(logger).Log("msg", "This option for --enable-feature is now permanently enabled and therefore a no-op.", "option", promqlAtModifier)
 			}
 			if feature == promqlNegativeOffset {
 				level.Warn(logger).Log("msg", "This option for --enable-feature is now permanently enabled and therefore a no-op.", "option", promqlNegativeOffset)
 			}
+			if feature == queryPushdown {
+				level.Warn(logger).Log("msg", "This option for --enable-feature is now permanently deprecated and therefore ignored.", "option", queryPushdown)
+			}
 		}
 
 		httpLogOpts, err := logging.ParseHTTPOptions(reqLogConfig)
@@ -333,7 +332,6 @@ func registerQuery(app *extkingpin.App) {
 			*strictEndpoints,
 			*strictEndpointGroups,
 			*webDisableCORS,
-			enableQueryPushdown,
 			*alertQueryURL,
 			*grpcProxyStrategy,
 			component.Query,
@@ -412,7 +410,6 @@ func runQuery(
 	strictEndpoints []string,
 	strictEndpointGroups []string,
 	disableCORS bool,
-	enableQueryPushdown bool,
 	alertQueryURL string,
 	grpcProxyStrategy string,
 	comp component.Component,
@@ -699,7 +696,6 @@ func runQuery(
 			enableTargetPartialResponse,
 			enableMetricMetadataPartialResponse,
 			enableExemplarPartialResponse,
-			enableQueryPushdown,
 			queryReplicaLabels,
 			flagsMap,
 			defaultRangeQueryStep,

diff --git a/docs/components/query.md b/docs/components/query.md
@@ -272,9 +272,8 @@ Flags:
       --alert.query-url=ALERT.QUERY-URL
                                  The external Thanos Query URL that would be set
                                  in all alerts 'Source' field.
-      --enable-feature= ...      Comma separated experimental feature names
-                                 to enable.The current list of features is
-                                 query-pushdown.
+      --enable-feature= ...      Comma separated experimental feature names to
+                                 enable.The current list of features is empty.
       --endpoint=<endpoint> ...  Addresses of statically configured Thanos
                                  API servers (repeatable). The scheme may be
                                  prefixed with 'dns+' or 'dnssrv+' to detect

diff --git a/pkg/api/query/grpc.go b/pkg/api/query/grpc.go
@@ -97,7 +97,6 @@ func (g *GRPCAPI) Query(request *querypb.QueryRequest, server querypb.Query_Quer
 		storeMatchers,
 		maxResolution,
 		request.EnablePartialResponse,
-		request.EnableQueryPushdown,
 		false,
 		request.ShardInfo,
 		query.NoopSeriesStatsReporter,
@@ -195,7 +194,6 @@ func (g *GRPCAPI) QueryRange(request *querypb.QueryRangeRequest, srv querypb.Que
 		storeMatchers,
 		maxResolution,
 		request.EnablePartialResponse,
-		request.EnableQueryPushdown,
 		false,
 		request.ShardInfo,
 		query.NoopSeriesStatsReporter,

diff --git a/pkg/api/query/querypb/query.pb.go b/pkg/api/query/querypb/query.pb.go
diff --git a/pkg/api/query/querypb/query.proto b/pkg/api/query/querypb/query.proto
@@ -41,6 +41,7 @@ message QueryRequest {
 
   bool enableDedup = 7;
   bool enablePartialResponse = 8;
+  // Deprecated
   bool enableQueryPushdown = 9;
   bool skipChunks = 10;
 
@@ -80,6 +81,7 @@ message QueryRangeRequest {
 
   bool enableDedup = 9;
   bool enablePartialResponse = 10;
+  // Deprecated
   bool enableQueryPushdown = 11;
   bool skipChunks = 12;
 

diff --git a/pkg/api/query/v1.go b/pkg/api/query/v1.go
@@ -158,7 +158,6 @@ type QueryAPI struct {
 	enableTargetPartialResponse         bool
 	enableMetricMetadataPartialResponse bool
 	enableExemplarPartialResponse       bool
-	enableQueryPushdown                 bool
 	disableCORS                         bool
 
 	replicaLabels  []string
@@ -195,7 +194,6 @@ func NewQueryAPI(
 	enableTargetPartialResponse bool,
 	enableMetricMetadataPartialResponse bool,
 	enableExemplarPartialResponse bool,
-	enableQueryPushdown bool,
 	replicaLabels []string,
 	flagsMap map[string]string,
 	defaultRangeQueryStep time.Duration,
@@ -230,7 +228,6 @@ func NewQueryAPI(
 		enableTargetPartialResponse:            enableTargetPartialResponse,
 		enableMetricMetadataPartialResponse:    enableMetricMetadataPartialResponse,
 		enableExemplarPartialResponse:          enableExemplarPartialResponse,
-		enableQueryPushdown:                    enableQueryPushdown,
 		replicaLabels:                          replicaLabels,
 		endpointStatus:                         endpointStatus,
 		defaultRangeQueryStep:                  defaultRangeQueryStep,
@@ -560,7 +557,6 @@ func (qapi *QueryAPI) queryExplain(r *http.Request) (interface{}, []error, *api.
 			storeDebugMatchers,
 			maxSourceResolution,
 			enablePartialResponse,
-			qapi.enableQueryPushdown,
 			false,
 			shardInfo,
 			query.NewAggregateStatsReporter(&seriesStats),
@@ -665,7 +661,6 @@ func (qapi *QueryAPI) query(r *http.Request) (interface{}, []error, *api.ApiErro
 			storeDebugMatchers,
 			maxSourceResolution,
 			enablePartialResponse,
-			qapi.enableQueryPushdown,
 			false,
 			shardInfo,
 			query.NewAggregateStatsReporter(&seriesStats),
@@ -832,7 +827,6 @@ func (qapi *QueryAPI) queryRangeExplain(r *http.Request) (interface{}, []error,
 			storeDebugMatchers,
 			maxSourceResolution,
 			enablePartialResponse,
-			qapi.enableQueryPushdown,
 			false,
 			shardInfo,
 			query.NewAggregateStatsReporter(&seriesStats),
@@ -967,7 +961,6 @@ func (qapi *QueryAPI) queryRange(r *http.Request) (interface{}, []error, *api.Ap
 			storeDebugMatchers,
 			maxSourceResolution,
 			enablePartialResponse,
-			qapi.enableQueryPushdown,
 			false,
 			shardInfo,
 			query.NewAggregateStatsReporter(&seriesStats),
@@ -1071,7 +1064,6 @@ func (qapi *QueryAPI) labelValues(r *http.Request) (interface{}, []error, *api.A
 		storeDebugMatchers,
 		0,
 		enablePartialResponse,
-		qapi.enableQueryPushdown,
 		true,
 		nil,
 		query.NoopSeriesStatsReporter,
@@ -1174,7 +1166,6 @@ func (qapi *QueryAPI) series(r *http.Request) (interface{}, []error, *api.ApiErr
 		storeDebugMatchers,
 		math.MaxInt64,
 		enablePartialResponse,
-		qapi.enableQueryPushdown,
 		true,
 		nil,
 		query.NoopSeriesStatsReporter,
@@ -1241,7 +1232,6 @@ func (qapi *QueryAPI) labelNames(r *http.Request) (interface{}, []error, *api.Ap
 		storeDebugMatchers,
 		0,
 		enablePartialResponse,
-		qapi.enableQueryPushdown,
 		true,
 		nil,
 		query.NoopSeriesStatsReporter,