From 3355f06783c697b1f638ac60239967a1ef12a64b Mon Sep 17 00:00:00 2001 From: iguazio-deploy Date: Sun, 22 Mar 2020 14:46:07 +0000 Subject: [PATCH] Updated TSDB to v0.9.20 --- go.mod | 6 +++--- go.sum | 6 +++++- vendor/github.com/v3io/frames/go.mod | 3 ++- vendor/github.com/v3io/frames/go.sum | 2 ++ vendor/github.com/v3io/v3io-tsdb/pkg/pquerier/querier.go | 9 --------- vendor/modules.txt | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 1b9f3c59489..389539e4e80 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( github.com/shurcooL/vfsgen v0.0.0-20180711163814-62bca832be04 github.com/smartystreets/goconvey v0.0.0-20190306220146-200a235640ff // indirect github.com/stretchr/testify v1.4.0 - github.com/v3io/v3io-tsdb v0.9.19 + github.com/v3io/v3io-tsdb v0.9.20 go.opencensus.io v0.19.2 // indirect golang.org/x/net v0.0.0-20190311183353-d8887717615a golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 @@ -112,6 +112,6 @@ replace labix.org/v2/mgo => github.com/go-mgo/mgo v0.0.0-20180705113738-7446a034 replace launchpad.net/gocheck => github.com/go-check/check v0.0.0-20180628173108-788fd78401277ebd861206a03c884797c6ec5541 -replace github.com/v3io/frames => github.com/v3io/frames v0.6.14-v0.9.19 +replace github.com/v3io/frames => github.com/v3io/frames v0.6.15-v0.9.20 -replace github.com/v3io/v3io-tsdb => github.com/v3io/v3io-tsdb v0.9.19 +replace github.com/v3io/v3io-tsdb => github.com/v3io/v3io-tsdb v0.9.20 diff --git a/go.sum b/go.sum index fe2dfbf41cf..50abc44bd6e 100644 --- a/go.sum +++ b/go.sum @@ -324,8 +324,8 @@ github.com/rlmcpherson/s3gof3r v0.5.0/go.mod h1:s7vv7SMDPInkitQMuZzH615G7yWHdrU2 github.com/rs/xid v1.1.0/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rubyist/circuitbreaker v2.2.1+incompatible h1:KUKd/pV8Geg77+8LNDwdow6rVCAYOp8+kHUyFvL6Mhk= github.com/rubyist/circuitbreaker v2.2.1+incompatible/go.mod h1:Ycs3JgJADPuzJDwffe12k6BZT8hxVi6lFK+gWYJLN4A= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday v1.5.2+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20161028232340-1d7be4effb13 h1:4AQBn5RJY4WH8t8TLEMZUsWeXHAUcoao42TCAfpEJJE= github.com/samuel/go-zookeeper v0.0.0-20161028232340-1d7be4effb13/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= @@ -374,6 +374,8 @@ github.com/v3io/frames v0.6.13-v0.9.18 h1:boNCrP76j/79qBdSGSF20sEdBjnwzfQD+Mfi5+ github.com/v3io/frames v0.6.13-v0.9.18/go.mod h1:O/n9q49+q225y/jrrXjAQbUI/v03nV/H52z/qPQCbNE= github.com/v3io/frames v0.6.14-v0.9.19 h1:TzxMOYUXNtb31cT9CXuTWFumSt+y/Xo6OXj/ofsfoBo= github.com/v3io/frames v0.6.14-v0.9.19/go.mod h1:FH0mybCjeQoPX2cIBKfRjIsw/aoE+hMoVSE0hIUlmFU= +github.com/v3io/frames v0.6.15-v0.9.20 h1:wtlnibr8vBp49H+gGCfu1WK6UNlbxHWEpPNRKkH5iec= +github.com/v3io/frames v0.6.15-v0.9.20/go.mod h1:iPII4u0GeF+QKyfBVgWWJKy4xgkQMKYdJquQECj1Xbw= github.com/v3io/v3io-go v0.0.0-20180415000000-1486c75b0e590a14580f7d9b6cef7a944a231ca7 h1:J+ps6exCjowNidrtawSQglJQpKrJ6v8UjBVTNrRTpMs= github.com/v3io/v3io-go v0.0.0-20180415000000-1486c75b0e590a14580f7d9b6cef7a944a231ca7/go.mod h1:MHc+d/Jg/y8lV4B9sgwTvuS3tEE9wS+kqtU0+D0Sr78= github.com/v3io/v3io-go v0.0.0-20190826150152-1f2c9a9a61cb715410a35662f5ddab2b306f95e7 h1:Qx3yIJPtDTJVv/gck/009TrBF/JMwe5RM3N9aTZ4Mlo= @@ -444,6 +446,8 @@ github.com/v3io/v3io-tsdb v0.9.18 h1:KWH3+cesiyOw0II1rZ5XjVmqlImvotneDTL6NSRei9I github.com/v3io/v3io-tsdb v0.9.18/go.mod h1:niG39x0WSqZNbRoy+WUZ1jb0t3ClV/tCU3Bsi1yUamc= github.com/v3io/v3io-tsdb v0.9.19 h1:re7tUbpHD7ac1OYf/Vs64we257c8XRMgbWV1mRx//TQ= github.com/v3io/v3io-tsdb v0.9.19/go.mod h1:PzSaxWWm4buDT8JAXqpMB5fFS/4IK7fgYI6X919RNww= +github.com/v3io/v3io-tsdb v0.9.20 h1:YrUWQ1oD387R71Y1emnaaAFJKsDhtjjVjUufhbuBQJc= +github.com/v3io/v3io-tsdb v0.9.20/go.mod h1:8xi2vWbHDIVfOsENKPAI+X70F7JZvfD9ucYYJ5YJYeI= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.0.0 h1:BwIoZQbBsTo3v2F5lz5Oy3TlTq4wLKTLV260EVTEWco= diff --git a/vendor/github.com/v3io/frames/go.mod b/vendor/github.com/v3io/frames/go.mod index 5703877c3c0..235a3c382b2 100644 --- a/vendor/github.com/v3io/frames/go.mod +++ b/vendor/github.com/v3io/frames/go.mod @@ -10,12 +10,13 @@ require ( github.com/kr/pretty v0.2.0 // indirect github.com/nuclio/errors v0.0.1 github.com/nuclio/logger v0.0.1 + github.com/nuclio/nuclio-test-go v0.0.0-20180704132150-0ce6587f8e37 // indirect github.com/nuclio/zap v0.0.2 github.com/pavius/impi v0.0.0-20200212064320-5db7efa5f87b // indirect github.com/pkg/errors v0.8.1 github.com/stretchr/testify v1.4.0 github.com/v3io/v3io-go v0.1.5-0.20200316155009-cc83de374ff2 - github.com/v3io/v3io-tsdb v0.9.19 + github.com/v3io/v3io-tsdb v0.9.20 github.com/valyala/fasthttp v1.2.0 github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a diff --git a/vendor/github.com/v3io/frames/go.sum b/vendor/github.com/v3io/frames/go.sum index bdaac3723cf..443fafddd8e 100644 --- a/vendor/github.com/v3io/frames/go.sum +++ b/vendor/github.com/v3io/frames/go.sum @@ -150,6 +150,8 @@ github.com/v3io/v3io-tsdb v0.9.18 h1:KWH3+cesiyOw0II1rZ5XjVmqlImvotneDTL6NSRei9I github.com/v3io/v3io-tsdb v0.9.18/go.mod h1:niG39x0WSqZNbRoy+WUZ1jb0t3ClV/tCU3Bsi1yUamc= github.com/v3io/v3io-tsdb v0.9.19 h1:re7tUbpHD7ac1OYf/Vs64we257c8XRMgbWV1mRx//TQ= github.com/v3io/v3io-tsdb v0.9.19/go.mod h1:PzSaxWWm4buDT8JAXqpMB5fFS/4IK7fgYI6X919RNww= +github.com/v3io/v3io-tsdb v0.9.20 h1:YrUWQ1oD387R71Y1emnaaAFJKsDhtjjVjUufhbuBQJc= +github.com/v3io/v3io-tsdb v0.9.20/go.mod h1:8xi2vWbHDIVfOsENKPAI+X70F7JZvfD9ucYYJ5YJYeI= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.0.0 h1:BwIoZQbBsTo3v2F5lz5Oy3TlTq4wLKTLV260EVTEWco= diff --git a/vendor/github.com/v3io/v3io-tsdb/pkg/pquerier/querier.go b/vendor/github.com/v3io/v3io-tsdb/pkg/pquerier/querier.go index 441242e1af1..e3df957cf0d 100644 --- a/vendor/github.com/v3io/v3io-tsdb/pkg/pquerier/querier.go +++ b/vendor/github.com/v3io/v3io-tsdb/pkg/pquerier/querier.go @@ -150,11 +150,6 @@ func (q *V3ioQuerier) baseSelectQry(params *SelectParams, showAggregateLabel boo return nil, errors.Wrap(err, "Failed to read/update the TSDB schema.") } - // TODO: should be checked in config - if !isPowerOfTwo(q.cfg.QryWorkers) { - return nil, errors.New("query workers num must be a power of 2 and > 0") - } - // If the config is set to use only client configuration override the query parameter. if q.cfg.UsePreciseAggregations { params.UseOnlyClientAggr = true @@ -198,10 +193,6 @@ func (q *V3ioQuerier) baseSelectQry(params *SelectParams, showAggregateLabel boo return } -func isPowerOfTwo(x int) bool { - return (x != 0) && ((x & (x - 1)) == 0) -} - // Return the current metric names func (q *V3ioQuerier) LabelValues(labelKey string) (result []string, err error) { q.performanceReporter.WithTimer("LabelValuesTimer", func() { diff --git a/vendor/modules.txt b/vendor/modules.txt index cb2e3793e65..67ee2a0dc2c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -298,7 +298,7 @@ github.com/shurcooL/vfsgen github.com/stretchr/testify/require github.com/stretchr/testify/suite github.com/stretchr/testify/assert -# github.com/v3io/frames v0.6.14-v0.9.18 => github.com/v3io/frames v0.6.14-v0.9.19 +# github.com/v3io/frames v0.6.14-v0.9.18 => github.com/v3io/frames v0.6.15-v0.9.20 github.com/v3io/frames github.com/v3io/frames/pb # github.com/v3io/v3io-go v0.1.5-0.20200316155009-cc83de374ff2 @@ -306,7 +306,7 @@ github.com/v3io/v3io-go/pkg/dataplane github.com/v3io/v3io-go/pkg/errors github.com/v3io/v3io-go/pkg/dataplane/http github.com/v3io/v3io-go/pkg/dataplane/schemas/node/common -# github.com/v3io/v3io-tsdb v0.9.19 => github.com/v3io/v3io-tsdb v0.9.19 +# github.com/v3io/v3io-tsdb v0.9.20 => github.com/v3io/v3io-tsdb v0.9.20 github.com/v3io/v3io-tsdb/pkg/aggregate github.com/v3io/v3io-tsdb/pkg/appender github.com/v3io/v3io-tsdb/pkg/config