Shard subqueries (#5846)

* shard subqueries Signed-off-by: Ben Ye <benye@amazon.com> * update changelog Signed-off-by: Ben Ye <benye@amazon.com> Signed-off-by: Ben Ye <benye@amazon.com>
thanos-io · Nov 2, 2022 · 50b4156 · 50b4156
1 parent 5898fb8
commit 50b4156
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 ### Changed
 
 - [#5716](https://github.com/thanos-io/thanos/pull/5716) DNS: Fix miekgdns resolver LookupSRV to work with CNAME records.
+- [#5846](https://github.com/thanos-io/thanos/pull/5846) Query Frontend: vertical query sharding supports subqueries.
 
 ### Removed
 

diff --git a/pkg/querysharding/analyzer.go b/pkg/querysharding/analyzer.go
@@ -89,9 +89,6 @@ func (a *QueryAnalyzer) Analyze(query string) (QueryAnalysis, error) {
 	var analysis QueryAnalysis
 	parser.Inspect(expr, func(node parser.Node, nodes []parser.Node) error {
 		switch n := node.(type) {
-		case *parser.SubqueryExpr:
-			isShardable = false
-			return fmt.Errorf("expressions with subqueries are not shardable")
 		case *parser.Call:
 			if n.Func != nil && contains(n.Func.Name, nonShardableFuncs) {
 				isShardable = false

diff --git a/pkg/querysharding/analyzer_test.go b/pkg/querysharding/analyzer_test.go
@@ -33,11 +33,11 @@ func TestAnalyzeQuery(t *testing.T) {
 			expression: "count(sum without (pod) (http_requests_total))",
 		},
 		{
-			name:       "aggregate expression with subquery",
+			name:       "aggregate expression with label_replace",
 			expression: `sum by (pod) (label_replace(metric, "dst_label", "$1", "src_label", "re"))`,
 		},
 		{
-			name:       "aggregate without expression with subquery",
+			name:       "aggregate without expression with label_replace",
 			expression: `sum without (pod) (label_replace(metric, "dst_label", "$1", "src_label", "re"))`,
 		},
 		{
@@ -57,7 +57,7 @@ func TestAnalyzeQuery(t *testing.T) {
 			expression: `sum by (pod) (http_requests_total{code="400"}) / sum by (cluster) (http_requests_total)`,
 		},
 		{
-			name:       "binary expression with vector matching and subquery",
+			name:       "binary expression with vector matching and label_replace",
 			expression: `http_requests_total{code="400"} / on (pod) label_replace(metric, "dst_label", "$1", "src_label", "re")`,
 		},
 		{
@@ -127,6 +127,16 @@ sum by (container) (
 			expression:     "histogram_quantile(0.95, sum(rate(metric[1m])) by (le, cluster))",
 			shardingLabels: []string{"cluster"},
 		},
+		{
+			name:           "subquery",
+			expression:     "sum(http_requests_total) by (pod, cluster) [1h:1m]",
+			shardingLabels: []string{"cluster", "pod"},
+		},
+		{
+			name:           "subquery with function",
+			expression:     "increase(sum(http_requests_total) by (pod, cluster) [1h:1m])",
+			shardingLabels: []string{"cluster", "pod"},
+		},
 	}
 
 	shardableWithoutLabels := []testCase{