build(flux): update Flux to v0.82.2

influxdata · Aug 25, 2020 · df41d42 · df41d42
1 parent 56988b9
commit df41d42
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -47,7 +47,7 @@ require (
 	github.com/hashicorp/vault/api v1.0.2
 	github.com/imdario/mergo v0.3.9 // indirect
 	github.com/influxdata/cron v0.0.0-20191203200038-ded12750aac6
-	github.com/influxdata/flux v0.81.0
+	github.com/influxdata/flux v0.82.2
 	github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69
 	github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6
 	github.com/influxdata/pkg-config v0.2.3

diff --git a/go.sum b/go.sum
@@ -350,8 +350,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/cron v0.0.0-20191203200038-ded12750aac6 h1:OtjKkeWDjUbyMi82C7XXy7Tvm2LXMwiBBXyFIGNPaGA=
 github.com/influxdata/cron v0.0.0-20191203200038-ded12750aac6/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og=
-github.com/influxdata/flux v0.81.0 h1:O1ApTwk4DoeWqCRbihYRMsRxulrkStXjh/tnNl07a6w=
-github.com/influxdata/flux v0.81.0/go.mod h1:sAAIEgQTlTpsXCUQ49ymoRsKqraPzIb7F3paT72/lE0=
+github.com/influxdata/flux v0.82.2 h1:VtoF8pbyoS+3QLQQmihSmV0Ly6g/A73x+3VBUp9t15g=
+github.com/influxdata/flux v0.82.2/go.mod h1:sAAIEgQTlTpsXCUQ49ymoRsKqraPzIb7F3paT72/lE0=
 github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU=
 github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69/go.mod h1:pwymjR6SrP3gD3pRj9RJwdl1j5s3doEEV8gS4X9qSzA=
 github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6 h1:CFx+pP90q/qg3spoiZjf8donE4WpAdjeJfPOcoNqkWo=

diff --git a/query/control/controller.go b/query/control/controller.go
@@ -572,6 +572,10 @@ func (q *Query) Results() <-chan flux.Result {
 	return q.results
 }
 
+func (q *Query) ProfilerResults() (flux.ResultIterator, error) {
+	return nil, nil
+}
+
 func (q *Query) recordUnusedMemory() {
 	unused := q.c.GetUnusedMemoryBytes()
 	q.c.metrics.memoryUnused.WithLabelValues(q.labelValues...).Set(float64(unused))

diff --git a/query/mock/service.go b/query/mock/service.go
@@ -89,6 +89,9 @@ func (q *Query) SetErr(err error) *Query {
 func (q *Query) Results() <-chan flux.Result {
 	return q.results
 }
+func (q *Query) ProfilerResults() (flux.ResultIterator, error) {
+	return nil, nil
+}
 
 func (q *Query) Done() {
 	q.Cancel()

diff --git a/query/promql/internal/promqltests/go.mod b/query/promql/internal/promqltests/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/go-kit/kit v0.10.0 // indirect
 	github.com/google/go-cmp v0.5.0
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/influxdata/flux v0.81.0
+	github.com/influxdata/flux v0.82.2
 	github.com/influxdata/influxdb/v2 v2.0.0-00010101000000-000000000000
 	github.com/influxdata/influxql v1.0.1 // indirect
 	github.com/influxdata/promql/v2 v2.12.0

diff --git a/query/promql/internal/promqltests/go.sum b/query/promql/internal/promqltests/go.sum
@@ -389,8 +389,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/cron v0.0.0-20191203200038-ded12750aac6 h1:OtjKkeWDjUbyMi82C7XXy7Tvm2LXMwiBBXyFIGNPaGA=
 github.com/influxdata/cron v0.0.0-20191203200038-ded12750aac6/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og=
-github.com/influxdata/flux v0.81.0 h1:O1ApTwk4DoeWqCRbihYRMsRxulrkStXjh/tnNl07a6w=
-github.com/influxdata/flux v0.81.0/go.mod h1:sAAIEgQTlTpsXCUQ49ymoRsKqraPzIb7F3paT72/lE0=
+github.com/influxdata/flux v0.82.2 h1:VtoF8pbyoS+3QLQQmihSmV0Ly6g/A73x+3VBUp9t15g=
+github.com/influxdata/flux v0.82.2/go.mod h1:sAAIEgQTlTpsXCUQ49ymoRsKqraPzIb7F3paT72/lE0=
 github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU=
 github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69/go.mod h1:pwymjR6SrP3gD3pRj9RJwdl1j5s3doEEV8gS4X9qSzA=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=

diff --git a/query/stdlib/testing/testing.go b/query/stdlib/testing/testing.go
@@ -153,6 +153,9 @@ var FluxEndToEndSkipList = map[string]map[string]string{
 		"emptyTable": "tests a source",
 		"year":       "flakey test: https://github.com/influxdata/influxdb/issues/15667",
 	},
+	"testing/influxql": {
+		"cumulative_sum": "invalid test data requires loadStorage to be overridden. See https://github.com/influxdata/flux/issues/3145",
+	},
 }
 
 type PerTestFeatureFlagMap = map[string]map[string]map[string]string

diff --git a/task/backend/executor/support_test.go b/task/backend/executor/support_test.go
@@ -171,10 +171,11 @@ type fakeQuery struct {
 
 var _ flux.Query = (*fakeQuery)(nil)
 
-func (q *fakeQuery) Done()                       {}
-func (q *fakeQuery) Cancel()                     { close(q.results) }
-func (q *fakeQuery) Statistics() flux.Statistics { return flux.Statistics{} }
-func (q *fakeQuery) Results() <-chan flux.Result { return q.results }
+func (q *fakeQuery) Done()                                         {}
+func (q *fakeQuery) Cancel()                                       { close(q.results) }
+func (q *fakeQuery) Statistics() flux.Statistics                   { return flux.Statistics{} }
+func (q *fakeQuery) Results() <-chan flux.Result                   { return q.results }
+func (q *fakeQuery) ProfilerResults() (flux.ResultIterator, error) { return nil, nil }
 
 func (q *fakeQuery) Err() error {
 	if q.ctxErr != nil {