feat(query): enable min/max pushdown

influxdata · Apr 6, 2021 · 8a4b490 · 8a4b490
1 parent 28ae9ea
commit 8a4b490
Show file tree

Hide file tree

Showing 6 changed files with 834 additions and 334 deletions.
diff --git a/query/stdlib/influxdata/influxdb/min_max_influxdb_test.flux b/query/stdlib/influxdata/influxdb/min_max_influxdb_test.flux
@@ -0,0 +1,59 @@
+package influxdb_test
+
+import "testing/expect"
+
+option now = () => (2030-01-01T00:00:00Z)
+
+testcase push_down_min_bare extends "flux/planner/group_min_test" {
+    expect.planner(rules: [
+        "PushDownGroupAggregateRule": 1,
+        "PushDownRangeRule": 1,
+        "PushDownFilterRule": 1,
+    ])
+    group_min_test.group_min_bare()
+}
+
+testcase push_down_min_bare_host extends "flux/planner/group_min_test" {
+    expect.planner(rules: [
+        "PushDownGroupAggregateRule": 1,
+        "PushDownRangeRule": 1,
+        "PushDownFilterRule": 1,
+    ])
+    group_min_test.group_min_bare_host()
+}
+
+testcase push_down_min_bare_field extends "flux/planner/group_min_test" {
+    expect.planner(rules: [
+        "PushDownGroupAggregateRule": 1,
+        "PushDownRangeRule": 1,
+        "PushDownFilterRule": 1,
+    ])
+    group_min_test.group_min_bare_field()
+}
+
+testcase push_down_max_bare extends "flux/planner/group_max_test" {
+    expect.planner(rules: [
+        "PushDownGroupAggregateRule": 1,
+        "PushDownRangeRule": 1,
+        "PushDownFilterRule": 1,
+    ])
+    group_max_test.group_max_bare()
+}
+
+testcase push_down_max_bare_host extends "flux/planner/group_max_test" {
+    expect.planner(rules: [
+        "PushDownGroupAggregateRule": 1,
+        "PushDownRangeRule": 1,
+        "PushDownFilterRule": 1,
+    ])
+    group_max_test.group_max_bare_host()
+}
+
+testcase push_down_max_bare_field extends "flux/planner/group_max_test" {
+    expect.planner(rules: [
+        "PushDownGroupAggregateRule": 1,
+        "PushDownRangeRule": 1,
+        "PushDownFilterRule": 1,
+    ])
+    group_max_test.group_max_bare_field()
+}
diff --git a/query/stdlib/influxdata/influxdb/rules.go b/query/stdlib/influxdata/influxdb/rules.go
@@ -30,7 +30,7 @@ func init() {
 		PushDownWindowAggregateByTimeRule{},
 		PushDownBareAggregateRule{},
 		GroupWindowAggregateTransposeRule{},
-		// PushDownGroupAggregateRule{},
+		PushDownGroupAggregateRule{},
 	)
 	plan.RegisterLogicalRules(
 		MergeFiltersRule{},