From 2b52224e8433e29f4d27199174b8636e46d86822 Mon Sep 17 00:00:00 2001 From: jlapacik Date: Mon, 26 Nov 2018 13:19:14 -0800 Subject: [PATCH] update flux dependency - add missing Statistics() methods --- go.mod | 2 +- go.sum | 4 ++-- query/influxql/result_test.go | 4 ++++ storage/reads/table.go | 4 ++++ task/backend/executor/executor_test.go | 4 ++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e32917842a..1bc73ea82d 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/hashicorp/raft v1.0.0 // indirect github.com/imdario/mergo v0.3.6 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/influxdata/flux v0.7.1-0.20181113013654-f98d31e736ec + github.com/influxdata/flux v0.7.1-0.20181121233512-f499ec2a251b github.com/influxdata/influxdb v0.0.0-20181017211453-9520b8d95606 github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6 github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368 diff --git a/go.sum b/go.sum index d9f2b757a4..6f9d8518c4 100644 --- a/go.sum +++ b/go.sum @@ -120,8 +120,8 @@ github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/flux v0.7.1-0.20181113013654-f98d31e736ec h1:qlnY8m4Iy+lL6l3gM+Kn+G2IawgD2FNSbt/9uosVuik= -github.com/influxdata/flux v0.7.1-0.20181113013654-f98d31e736ec/go.mod h1:wC5PBWVC/p7SQjKZNJ/dtwAuIufYHOVapzlC/A3awbQ= +github.com/influxdata/flux v0.7.1-0.20181121233512-f499ec2a251b h1:AWzGtLkrs/4EaYMPsZ6k8OLEeSOegW585e2CwFtXorA= +github.com/influxdata/flux v0.7.1-0.20181121233512-f499ec2a251b/go.mod h1:/NSM1WBmKpRAf1LYn1+raEO4TlYI9ZhIFd4UP03XWsQ= github.com/influxdata/goreleaser v0.86.2-0.20181010170531-0fd209ba67f5/go.mod h1:aVuBpDAT5VtjtUxzvBt8HOd0buzvvk7OX3H2iaviixg= github.com/influxdata/influxdb v0.0.0-20181017211453-9520b8d95606 h1:LBPg9NDkmVEGr22IrYPNsESFPjUnSgAbIgClv65dMIg= github.com/influxdata/influxdb v0.0.0-20181017211453-9520b8d95606/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= diff --git a/query/influxql/result_test.go b/query/influxql/result_test.go index 6c6a891943..6e84dcfcb2 100644 --- a/query/influxql/result_test.go +++ b/query/influxql/result_test.go @@ -110,6 +110,10 @@ type resultErrorIterator struct { Error string } +func (*resultErrorIterator) Statistics() flux.Statistics { + return flux.Statistics{} +} + func (*resultErrorIterator) Release() {} func (*resultErrorIterator) More() bool { return false } func (*resultErrorIterator) Next() flux.Result { panic("no results") } diff --git a/storage/reads/table.go b/storage/reads/table.go index a7c9787b51..524bc47780 100644 --- a/storage/reads/table.go +++ b/storage/reads/table.go @@ -53,6 +53,10 @@ func newTable( } } +func (t *table) Statistics() flux.Statistics { + return flux.Statistics{} +} + func (t *table) Key() flux.GroupKey { return t.key } func (t *table) Cols() []flux.ColMeta { return t.cols } func (t *table) RefCount(n int) {} diff --git a/task/backend/executor/executor_test.go b/task/backend/executor/executor_test.go index f6530f92cc..8010aad2b0 100644 --- a/task/backend/executor/executor_test.go +++ b/task/backend/executor/executor_test.go @@ -198,6 +198,10 @@ func newFakeResult() *fakeResult { return &fakeResult{name: "res", table: t} } +func (r *fakeResult) Statistics() flux.Statistics { + return flux.Statistics{} +} + func (r *fakeResult) Name() string { return r.name } func (r *fakeResult) Tables() flux.TableIterator { return tables{r.table} }