influxdata · bnpfeife · Nov 15, 2022 · Oct 21, 2022 · Oct 24, 2022 · Oct 24, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -244,7 +244,7 @@ jobs:
   unit_test_race:
     docker:
       - image: quay.io/influxdb/cross-builder:<< pipeline.parameters.cross-container-tag >>
-    resource_class: large
+    resource_class: xlarge
     steps:
       - checkout
       - restore_cache:
@@ -257,7 +257,17 @@ jobs:
             set -x
             mkdir -p junit-race/
             export GORACE="halt_on_error=1"
-            gotestsum --junitfile junit-race/influxdb.junit.xml -- -race ./...
+            # "resource_class: xlarge" creates a Docker container with eight
+            # virtual cpu cores. However, applications like "nproc" return
+            # the host machine's core count (which in this case is 36).
+            # When less cores are available than advertised, the
+            # race-tests fail.
+            #
+            # We'll manually reduce the number of available cores to what
+            # is specified by the CircleCI documentation:
+            # https://circleci.com/product/features/resource-classes/
+            taskset -c 0-7 \
+              gotestsum --junitfile junit-race/influxdb.junit.xml -- -race ./...
           no_output_timeout: 1500s
       - store_test_results:
           path: junit-race/

diff --git a/cmd/influx_tools/internal/format/binary/tools_binary.pb.go b/cmd/influx_tools/internal/format/binary/tools_binary.pb.go
diff --git a/cmd/influxd/backup_util/internal/backup_util.pb.go b/cmd/influxd/backup_util/internal/backup_util.pb.go
diff --git a/cmd/influxd/run/server.go b/cmd/influxd/run/server.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/influxdata/flux"
 	"github.com/influxdata/flux/dependencies/testing"
+	"github.com/influxdata/flux/execute/executetest"
 	"github.com/influxdata/influxdb"
 	"github.com/influxdata/influxdb/coordinator"
 	influxdb2 "github.com/influxdata/influxdb/flux/stdlib/influxdata/influxdb"
@@ -312,10 +313,16 @@ func (s *Server) appendHTTPDService(c httpd.Config) error {
 		if err != nil {
 			return err
 		}
+
+		deps := []flux.Dependency{storageDep, testing.FrameworkConfig{}}
+		if s.config.HTTPD.FluxTesting {
+			deps = append(deps, executetest.NewDefaultTestFlagger())
+		}
+
 		srv.Handler.Controller, err = control.New(
 			s.config.FluxController,
 			s.Logger.With(zap.String("service", "flux-controller")),
-			[]flux.Dependency{storageDep, testing.FrameworkConfig{}},
+			deps,
 		)
 		if err != nil {
 			return err

diff --git a/flux/stdlib/influxdata/influxdb/buckets.go b/flux/stdlib/influxdata/influxdb/buckets.go
@@ -149,7 +149,7 @@ func (rule LocalBucketsRule) Name() string {
 }
 
 func (rule LocalBucketsRule) Pattern() plan.Pattern {
-	return plan.Pat(influxdb.BucketsKind)
+	return plan.MultiSuccessor(influxdb.BucketsKind)
 }
 
 func (rule LocalBucketsRule) Rewrite(ctx context.Context, node plan.Node) (plan.Node, bool, error) {

diff --git a/flux/stdlib/influxdata/influxdb/filter_test.flux b/flux/stdlib/influxdata/influxdb/filter_test.flux
@@ -33,9 +33,44 @@ testcase filter {
 ,,0,2018-05-22T19:53:36Z,system,host.local,load1,1.63
 ")
 
-    got = testing.loadStorage(csv: input)
+    got = csv.from(csv: input)
+        |> testing.load()
         |> range(start: -100y)
         |> filter(fn: (r) => r._measurement == "system" and r._field == "load1")
         |> drop(columns: ["_start", "_stop"])
     testing.diff(want, got)
 }
+
+
+input_issue_4804 = "#datatype,string,long,dateTime:RFC3339,string,string,string,boolean
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,host,_field,_value
+,,0,2018-05-22T19:53:26Z,system,host.local,load1,true
+,,0,2018-05-22T19:53:36Z,system,host.local,load1,false
+,,1,2018-05-22T19:53:26Z,system,host.local,load3,false
+,,2,2018-05-22T19:53:26Z,system,host.local,load4,true
+"
+
+testcase flux_issue_4804 {
+    expect.planner(rules: [
+        "influxdata/influxdb.FromStorageRule": 1,
+        "PushDownRangeRule": 1,
+        "PushDownFilterRule": 1,
+    ])
+
+    want = csv.from(csv: "#datatype,string,long,dateTime:RFC3339,string,string,string,boolean
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,host,_field,_value
+,,0,2018-05-22T19:53:26Z,system,host.local,load1,true
+,,1,2018-05-22T19:53:26Z,system,host.local,load3,false
+")
+
+    got = csv.from(csv: input_issue_4804)
+        |> testing.load()
+        |> range(start: -100y)
+        |> filter(fn: (r) => ((r["_field"] == "load1" and r["_value"] == true) or (r["_field"] == "load3" and r["_value"] == false)))
+        |> drop(columns: ["_start", "_stop"])
+    testing.diff(want, got)
+}
diff --git a/flux/stdlib/influxdata/influxdb/multi_measure_test.flux b/flux/stdlib/influxdata/influxdb/multi_measure_test.flux
@@ -0,0 +1,267 @@
+package influxdb_test
+
+import "csv"
+import "testing"
+
+option now = () => 2030-01-01T00:00:00Z
+
+input = "
+#datatype,string,long,dateTime:RFC3339,string,string,string,double
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,host,_field,_value
+,,0,2018-05-22T19:53:26Z,system,host.local,load1,1.83
+,,0,2018-05-22T19:53:36Z,system,host.local,load1,1.72
+,,0,2018-05-22T19:53:46Z,system,host.local,load1,1.74
+,,0,2018-05-22T19:53:56Z,system,host.local,load1,1.63
+,,0,2018-05-22T19:54:06Z,system,host.local,load1,1.91
+,,0,2018-05-22T19:54:16Z,system,host.local,load1,1.84
+
+,,1,2018-05-22T19:53:26Z,sys,host.local,load3,1.98
+,,1,2018-05-22T19:53:36Z,sys,host.local,load3,1.97
+,,1,2018-05-22T19:53:46Z,sys,host.local,load3,1.97
+,,1,2018-05-22T19:53:56Z,sys,host.local,load3,1.96
+,,1,2018-05-22T19:54:06Z,sys,host.local,load3,1.98
+,,1,2018-05-22T19:54:16Z,sys,host.local,load3,1.97
+
+,,2,2018-05-22T19:53:26Z,system,host.local,load5,1.95
+,,2,2018-05-22T19:53:36Z,system,host.local,load5,1.92
+,,2,2018-05-22T19:53:46Z,system,host.local,load5,1.92
+,,2,2018-05-22T19:53:56Z,system,host.local,load5,1.89
+,,2,2018-05-22T19:54:06Z,system,host.local,load5,1.94
+,,2,2018-05-22T19:54:16Z,system,host.local,load5,1.93
+
+,,3,2018-05-22T19:53:26Z,var,host.local,load3,91.98
+,,3,2018-05-22T19:53:36Z,var,host.local,load3,91.97
+,,3,2018-05-22T19:53:46Z,var,host.local,load3,91.97
+,,3,2018-05-22T19:53:56Z,var,host.local,load3,91.96
+,,3,2018-05-22T19:54:06Z,var,host.local,load3,91.98
+,,3,2018-05-22T19:54:16Z,var,host.local,load3,91.97
+
+,,4,2018-05-22T19:53:26Z,swap,host.global,used_percent,82.98
+,,4,2018-05-22T19:53:36Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:53:46Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:53:56Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:54:06Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:54:16Z,swap,host.global,used_percent,82.64
+
+#datatype,string,long,dateTime:RFC3339,string,string,string,double
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,loc,_field,_value
+,,0,2018-05-22T19:53:26Z,locale,en,lat,37.09
+,,0,2018-05-22T19:53:36Z,locale,en,lat,37.10
+,,0,2018-05-22T19:53:46Z,locale,en,lat,37.08
+"
+
+testcase multi_measure {
+    got = csv.from(csv: input)
+        |> testing.load()
+        |> range(start: 2018-01-01T00:00:00Z, stop: 2019-01-01T00:00:00Z)
+        |> filter(fn: (r) => r["_measurement"] == "system" or r["_measurement"] == "sys") 
+        |> filter(fn: (r) => r["_field"] == "load1" or r["_field"] == "load3")
+        |> drop(columns: ["_start", "_stop"])
+
+    want = csv.from(csv: "#datatype,string,long,dateTime:RFC3339,string,string,string,double
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,host,_field,_value
+,,0,2018-05-22T19:53:26Z,system,host.local,load1,1.83
+,,0,2018-05-22T19:53:36Z,system,host.local,load1,1.72
+,,0,2018-05-22T19:53:46Z,system,host.local,load1,1.74
+,,0,2018-05-22T19:53:56Z,system,host.local,load1,1.63
+,,0,2018-05-22T19:54:06Z,system,host.local,load1,1.91
+,,0,2018-05-22T19:54:16Z,system,host.local,load1,1.84
+,,1,2018-05-22T19:53:26Z,sys,host.local,load3,1.98
+,,1,2018-05-22T19:53:36Z,sys,host.local,load3,1.97
+,,1,2018-05-22T19:53:46Z,sys,host.local,load3,1.97
+,,1,2018-05-22T19:53:56Z,sys,host.local,load3,1.96
+,,1,2018-05-22T19:54:06Z,sys,host.local,load3,1.98
+,,1,2018-05-22T19:54:16Z,sys,host.local,load3,1.97
+")
+
+    testing.diff(got, want)
+}
+
+testcase multi_measure_match_all {
+    got = csv.from(csv: input)
+        |> testing.load()
+        |> range(start: 2018-01-01T00:00:00Z, stop: 2019-01-01T00:00:00Z)
+        |> filter(fn: (r) => r["_measurement"] == "system" or r["_measurement"] == "sys" or r["_measurement"] == "var" or r["_measurement"] == "swap") 
+        |> filter(fn: (r) => r["_field"] == "load1" or r["_field"] == "load3" or r["_field"] == "load5" or r["_field"] == "used_percent")
+        |> drop(columns: ["_start", "_stop"])
+
+    want = csv.from(csv: "#datatype,string,long,dateTime:RFC3339,string,string,string,double
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,host,_field,_value
+,,0,2018-05-22T19:53:26Z,system,host.local,load1,1.83
+,,0,2018-05-22T19:53:36Z,system,host.local,load1,1.72
+,,0,2018-05-22T19:53:46Z,system,host.local,load1,1.74
+,,0,2018-05-22T19:53:56Z,system,host.local,load1,1.63
+,,0,2018-05-22T19:54:06Z,system,host.local,load1,1.91
+,,0,2018-05-22T19:54:16Z,system,host.local,load1,1.84
+,,1,2018-05-22T19:53:26Z,sys,host.local,load3,1.98
+,,1,2018-05-22T19:53:36Z,sys,host.local,load3,1.97
+,,1,2018-05-22T19:53:46Z,sys,host.local,load3,1.97
+,,1,2018-05-22T19:53:56Z,sys,host.local,load3,1.96
+,,1,2018-05-22T19:54:06Z,sys,host.local,load3,1.98
+,,1,2018-05-22T19:54:16Z,sys,host.local,load3,1.97
+,,2,2018-05-22T19:53:26Z,system,host.local,load5,1.95
+,,2,2018-05-22T19:53:36Z,system,host.local,load5,1.92
+,,2,2018-05-22T19:53:46Z,system,host.local,load5,1.92
+,,2,2018-05-22T19:53:56Z,system,host.local,load5,1.89
+,,2,2018-05-22T19:54:06Z,system,host.local,load5,1.94
+,,2,2018-05-22T19:54:16Z,system,host.local,load5,1.93
+,,3,2018-05-22T19:53:26Z,var,host.local,load3,91.98
+,,3,2018-05-22T19:53:36Z,var,host.local,load3,91.97
+,,3,2018-05-22T19:53:46Z,var,host.local,load3,91.97
+,,3,2018-05-22T19:53:56Z,var,host.local,load3,91.96
+,,3,2018-05-22T19:54:06Z,var,host.local,load3,91.98
+,,3,2018-05-22T19:54:16Z,var,host.local,load3,91.97
+,,4,2018-05-22T19:53:26Z,swap,host.global,used_percent,82.98
+,,4,2018-05-22T19:53:36Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:53:46Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:53:56Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:54:06Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:54:16Z,swap,host.global,used_percent,82.64
+")
+
+    testing.diff(got, want)
+}
+
+testcase multi_measure_tag_filter {
+    got = csv.from(csv: input)
+        |> testing.load()
+        |> range(start: 2018-01-01T00:00:00Z, stop: 2019-01-01T00:00:00Z)
+        |> filter(fn: (r) => r["_measurement"] == "system" or r["_measurement"] == "swap")
+        |> filter(fn: (r) => r["_field"] == "load1" or r["_field"] == "load3" or r["_field"] == "used_percent")
+        |> filter(fn: (r) => r["host"] == "host.local" or r["host"] == "host.global")
+        |> drop(columns: ["_start", "_stop"])
+
+    want = csv.from(csv: "#datatype,string,long,dateTime:RFC3339,string,string,string,double
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,host,_field,_value
+,,0,2018-05-22T19:53:26Z,system,host.local,load1,1.83
+,,0,2018-05-22T19:53:36Z,system,host.local,load1,1.72
+,,0,2018-05-22T19:53:46Z,system,host.local,load1,1.74
+,,0,2018-05-22T19:53:56Z,system,host.local,load1,1.63
+,,0,2018-05-22T19:54:06Z,system,host.local,load1,1.91
+,,0,2018-05-22T19:54:16Z,system,host.local,load1,1.84
+,,4,2018-05-22T19:53:26Z,swap,host.global,used_percent,82.98
+,,4,2018-05-22T19:53:36Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:53:46Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:53:56Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:54:06Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:54:16Z,swap,host.global,used_percent,82.64
+")
+
+    testing.diff(got, want)
+}
+
+testcase multi_measure_complex_or {
+    got = csv.from(csv: input)
+        |> testing.load()
+        |> range(start: 2018-01-01T00:00:00Z, stop: 2019-01-01T00:00:00Z)
+        |> filter(fn: (r) => (r["_measurement"] == "system" or r["_measurement"] == "swap") or (r["_measurement"] != "var" and r["host"] == "host.local")) 
+        |> drop(columns: ["_start", "_stop"])
+
+    want = csv.from(csv: "#datatype,string,long,dateTime:RFC3339,string,string,string,double
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,host,_field,_value
+,,0,2018-05-22T19:53:26Z,system,host.local,load1,1.83
+,,0,2018-05-22T19:53:36Z,system,host.local,load1,1.72
+,,0,2018-05-22T19:53:46Z,system,host.local,load1,1.74
+,,0,2018-05-22T19:53:56Z,system,host.local,load1,1.63
+,,0,2018-05-22T19:54:06Z,system,host.local,load1,1.91
+,,0,2018-05-22T19:54:16Z,system,host.local,load1,1.84
+,,2,2018-05-22T19:53:26Z,system,host.local,load5,1.95
+,,2,2018-05-22T19:53:36Z,system,host.local,load5,1.92
+,,2,2018-05-22T19:53:46Z,system,host.local,load5,1.92
+,,2,2018-05-22T19:53:56Z,system,host.local,load5,1.89
+,,2,2018-05-22T19:54:06Z,system,host.local,load5,1.94
+,,2,2018-05-22T19:54:16Z,system,host.local,load5,1.93
+,,4,2018-05-22T19:53:26Z,swap,host.global,used_percent,82.98
+,,4,2018-05-22T19:53:36Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:53:46Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:53:56Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:54:06Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:54:16Z,swap,host.global,used_percent,82.64
+,,1,2018-05-22T19:53:26Z,sys,host.local,load3,1.98
+,,1,2018-05-22T19:53:36Z,sys,host.local,load3,1.97
+,,1,2018-05-22T19:53:46Z,sys,host.local,load3,1.97
+,,1,2018-05-22T19:53:56Z,sys,host.local,load3,1.96
+,,1,2018-05-22T19:54:06Z,sys,host.local,load3,1.98
+,,1,2018-05-22T19:54:16Z,sys,host.local,load3,1.97
+")
+
+    testing.diff(got, want)
+}
+
+testcase multi_measure_complex_and {
+    got = csv.from(csv: input)
+        |> testing.load()
+        |> range(start: 2018-01-01T00:00:00Z, stop: 2019-01-01T00:00:00Z)
+        |> filter(fn: (r) => r["_measurement"] != "system" or r["_measurement"] == "swap") 
+        |> filter(fn: (r) => r["_measurement"] == "swap" or r["_measurement"] == "var") 
+        |> drop(columns: ["_start", "_stop"])
+
+    want = csv.from(csv: "#datatype,string,long,dateTime:RFC3339,string,string,string,double
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,host,_field,_value
+,,4,2018-05-22T19:53:26Z,swap,host.global,used_percent,82.98
+,,4,2018-05-22T19:53:36Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:53:46Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:53:56Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:54:06Z,swap,host.global,used_percent,82.59
+,,4,2018-05-22T19:54:16Z,swap,host.global,used_percent,82.64
+,,3,2018-05-22T19:53:26Z,var,host.local,load3,91.98
+,,3,2018-05-22T19:53:36Z,var,host.local,load3,91.97
+,,3,2018-05-22T19:53:46Z,var,host.local,load3,91.97
+,,3,2018-05-22T19:53:56Z,var,host.local,load3,91.96
+,,3,2018-05-22T19:54:06Z,var,host.local,load3,91.98
+,,3,2018-05-22T19:54:16Z,var,host.local,load3,91.97
+")
+
+    testing.diff(got, want)
+}
+
+testcase multi_measure_negation {
+    got = csv.from(csv: input)
+        |> testing.load()
+        |> range(start: 2018-01-01T00:00:00Z, stop: 2019-01-01T00:00:00Z)
+        |> filter(fn: (r) => r["_measurement"] != "system")
+        |> filter(fn: (r) => r["host"] == "host.local" or not exists r["host"])
+        |> drop(columns: ["_start", "_stop"])
+
+    want = csv.from(csv: "#datatype,string,long,dateTime:RFC3339,string,string,string,double
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,host,_field,_value
+,,1,2018-05-22T19:53:26Z,sys,host.local,load3,1.98
+,,1,2018-05-22T19:53:36Z,sys,host.local,load3,1.97
+,,1,2018-05-22T19:53:46Z,sys,host.local,load3,1.97
+,,1,2018-05-22T19:53:56Z,sys,host.local,load3,1.96
+,,1,2018-05-22T19:54:06Z,sys,host.local,load3,1.98
+,,1,2018-05-22T19:54:16Z,sys,host.local,load3,1.97
+,,3,2018-05-22T19:53:26Z,var,host.local,load3,91.98
+,,3,2018-05-22T19:53:36Z,var,host.local,load3,91.97
+,,3,2018-05-22T19:53:46Z,var,host.local,load3,91.97
+,,3,2018-05-22T19:53:56Z,var,host.local,load3,91.96
+,,3,2018-05-22T19:54:06Z,var,host.local,load3,91.98
+,,3,2018-05-22T19:54:16Z,var,host.local,load3,91.97
+
+#datatype,string,long,dateTime:RFC3339,string,string,string,double
+#group,false,false,false,true,true,true,false
+#default,_result,,,,,,
+,result,table,_time,_measurement,loc,_field,_value
+,,0,2018-05-22T19:53:26Z,locale,en,lat,37.09
+,,0,2018-05-22T19:53:36Z,locale,en,lat,37.10
+,,0,2018-05-22T19:53:46Z,locale,en,lat,37.08
+")
+
+    testing.diff(got, want)
+}