Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update flux dependency - add missing Statistics() methods

pull/10616/head
jlapacik 2018-11-26 13:19:14 -08:00
parent 4cb6e8b507
commit 2b52224e84
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -37,7 +37,7 @@ require (
github.com/hashicorp/raft v1.0.0 // indirect github.com/hashicorp/raft v1.0.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect github.com/imdario/mergo v0.3.6 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // 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/influxdb v0.0.0-20181017211453-9520b8d95606
github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6 github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6
github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368 github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368

4
go.sum
View File

@ -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/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 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= 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.20181121233512-f499ec2a251b h1:AWzGtLkrs/4EaYMPsZ6k8OLEeSOegW585e2CwFtXorA=
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/go.mod h1:/NSM1WBmKpRAf1LYn1+raEO4TlYI9ZhIFd4UP03XWsQ=
github.com/influxdata/goreleaser v0.86.2-0.20181010170531-0fd209ba67f5/go.mod h1:aVuBpDAT5VtjtUxzvBt8HOd0buzvvk7OX3H2iaviixg= 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 h1:LBPg9NDkmVEGr22IrYPNsESFPjUnSgAbIgClv65dMIg=
github.com/influxdata/influxdb v0.0.0-20181017211453-9520b8d95606/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= github.com/influxdata/influxdb v0.0.0-20181017211453-9520b8d95606/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=

4
query/influxql/result_test.go
View File

@ -110,6 +110,10 @@ type resultErrorIterator struct {
Error string Error string
} }
func (*resultErrorIterator) Statistics() flux.Statistics {
return flux.Statistics{}
}
func (*resultErrorIterator) Release() {} func (*resultErrorIterator) Release() {}
func (*resultErrorIterator) More() bool { return false } func (*resultErrorIterator) More() bool { return false }
func (*resultErrorIterator) Next() flux.Result { panic("no results") } func (*resultErrorIterator) Next() flux.Result { panic("no results") }

4
storage/reads/table.go
View File

@ -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) Key() flux.GroupKey { return t.key }
func (t *table) Cols() []flux.ColMeta { return t.cols } func (t *table) Cols() []flux.ColMeta { return t.cols }
func (t *table) RefCount(n int) {} func (t *table) RefCount(n int) {}

4
task/backend/executor/executor_test.go
View File

@ -198,6 +198,10 @@ func newFakeResult() *fakeResult {
return &fakeResult{name: "res", table: t} 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) Name() string { return r.name }
func (r *fakeResult) Tables() flux.TableIterator { return tables{r.table} } func (r *fakeResult) Tables() flux.TableIterator { return tables{r.table} }