diff --git a/Makefile b/Makefile index d534448f..62500ab7 100644 --- a/Makefile +++ b/Makefile @@ -85,32 +85,7 @@ bin: PHONY: gofmt gofmt: - if [ "$(gofmt -l .)" != "" ]; then echo 'Please run `go fmt ./...` to format the code'; fi - -.PHONY: impi -impi: - @echo Installing impi... - GO111MODULE=off go get -u github.com/pavius/impi/cmd/impi - @echo Verifying imports... - $(GOPATH)/bin/impi \ - --local github.com/iguazio/provazio \ - --skip pkg/controller/apis \ - --skip pkg/controller/client \ - --ignore-generated \ - --scheme stdLocalThirdParty \ - ./... - -$(GOPATH)/bin/golangci-lint: - @echo Installing golangci-lint... - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.49.0 - cp ./bin/golangci-lint $(GOPATH)/bin/ + @if [ "$(gofmt -l .)" != "" ]; then echo 'Please run `go fmt ./...` to format the code'; fi .PHONY: lint -lint: gofmt impi $(GOPATH)/bin/golangci-lint - @echo Linting... - @$(GOPATH)/bin/golangci-lint run \ - --disable-all --enable=deadcode --enable=goconst --enable=golint --enable=ineffassign \ - --enable=interfacer --enable=unconvert --enable=varcheck --enable=errcheck --enable=gofmt --enable=misspell \ - --enable=staticcheck --enable=gosimple --enable=govet --enable=goconst \ - cmd/... pkg/... internal/... - @echo done linting +lint: gofmt diff --git a/go.mod b/go.mod index d4e10f5e..b05de9bb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/v3io/v3io-tsdb -go 1.19 +go 1.24 require ( github.com/cespare/xxhash v1.1.0 @@ -8,13 +8,13 @@ require ( github.com/imdario/mergo v0.3.7 github.com/nuclio/logger v0.0.1 github.com/nuclio/nuclio-sdk-go v0.0.0-20190205170814-3b507fbd0324 - github.com/nuclio/zap v0.1.2 + github.com/nuclio/zap v0.3.1 github.com/pkg/errors v0.8.1 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a github.com/spf13/cobra v0.0.3 - github.com/stretchr/testify v1.8.1 - github.com/v3io/frames v0.10.5 - github.com/v3io/v3io-go v0.3.0 + github.com/stretchr/testify v1.8.4 + github.com/v3io/frames v0.13.9 + github.com/v3io/v3io-go v0.3.12 github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 ) @@ -22,25 +22,24 @@ require ( github.com/andybalholm/brotli v1.0.4 // indirect github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/golang/protobuf v1.2.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/klauspost/compress v1.15.9 // indirect - github.com/liranbg/uberzap v1.20.0-nuclio.1 // indirect - github.com/logrusorgru/aurora/v3 v3.0.0 // indirect + github.com/logrusorgru/aurora/v4 v4.0.0 // indirect github.com/nuclio/errors v0.0.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday v1.5.2 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.44.0 // indirect - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 // indirect - google.golang.org/grpc v1.20.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect + golang.org/x/net v0.43.0 // indirect + golang.org/x/sync v0.16.0 // indirect + golang.org/x/sys v0.35.0 // indirect + golang.org/x/text v0.28.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 // indirect + google.golang.org/grpc v1.72.0 // indirect + google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v2 v2.2.8 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect zombiezen.com/go/capnproto2 v2.17.0+incompatible // indirect diff --git a/go.sum b/go.sum index 7103b870..ea13333d 100644 --- a/go.sum +++ b/go.sum @@ -1,61 +1,57 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 h1:uHTyIjqVhYRhLbJ8nIiOJHkEZZ+5YoOsAbD3sk82NiE= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI= github.com/imdario/mergo v0.3.7/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/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/liranbg/uberzap v1.20.0-nuclio.1 h1:KUh2DHnhhF8q9iuzqZGxbIMg2i/5izyF+a8Cy9C6WsE= -github.com/liranbg/uberzap v1.20.0-nuclio.1/go.mod h1:Tj8cuE+vk7B5p5zywDnPCRk1FZX5UjyVugTtsTTHjxQ= -github.com/logrusorgru/aurora/v3 v3.0.0 h1:R6zcoZZbvVcGMvDCKo45A9U/lzYyzl5NfYIvznmDfE4= -github.com/logrusorgru/aurora/v3 v3.0.0/go.mod h1:vsR12bk5grlLvLXAYrBsb5Oc/N+LxAlxggSjiwMnCUc= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/logrusorgru/aurora/v4 v4.0.0 h1:sRjfPpun/63iADiSvGGjgA1cAYegEWMPCJdUpJYn9JA= +github.com/logrusorgru/aurora/v4 v4.0.0/go.mod h1:lP0iIa2nrnT/qoFXcOZSrZQpJ1o6n2CUf/hyHi2Q4ZQ= github.com/nuclio/errors v0.0.4 h1:Uf/Kfje0VJGYeuNAhuFNaL6bm0O1WCQOg8vEjiY85oQ= github.com/nuclio/errors v0.0.4/go.mod h1:KV56dHK50bOG4+fSUvCZA9D9Ky4utc5LBGGDCpxa8dY= github.com/nuclio/logger v0.0.1 h1:e+vT/Ug65RC+u0QX2J+lq3P57ZBwJ1ZA6Q2LCEcViwE= github.com/nuclio/logger v0.0.1/go.mod h1:ttazNAqTxKjQ7XrGDZxecumGa9KCIuJh88gzFY1mRXo= github.com/nuclio/nuclio-sdk-go v0.0.0-20190205170814-3b507fbd0324 h1:wSCJEH8mUQ3VTyUukbYdxmi0UMmB14Lu1GOlNOs0dWY= github.com/nuclio/nuclio-sdk-go v0.0.0-20190205170814-3b507fbd0324/go.mod h1:NqMgotiF6Y0Ho4+i5AvJhH3FRKAyL4IMaMv/eoUOkKQ= -github.com/nuclio/zap v0.1.2 h1:0xD5+IHEhbMmxp3T6hN7nRcukuo9+QuB5/zd/XHTqrU= -github.com/nuclio/zap v0.1.2/go.mod h1:n1BZF3JcFiQdap88qHX6IOPBKDjvV/bPcvVe6MFdxUg= +github.com/nuclio/zap v0.3.1 h1:PCcKrLtnYJp1raOmwtvSLGxmgfQdGWEpYz0F1U9JPeQ= +github.com/nuclio/zap v0.3.1/go.mod h1:2kDQ+ocGbA3Te120+F1rU9cjsaP5spYt/cRMTSHzz+0= github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= +github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhDYGoxY8uLVpewe1GDZ2vu2Tr/vTdVAkFQ= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= @@ -64,18 +60,12 @@ github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tinylib/msgp v1.1.1 h1:TnCZ3FIuKeaIy+F45+Cnp+caqdXGy4z74HvwXN+570Y= -github.com/v3io/frames v0.10.5 h1:8S3t5evnfBcxGrySX0jGEJnBcaqZJ0ENwwqeqCj0bes= -github.com/v3io/frames v0.10.5/go.mod h1:+qgmsrPCWO+Nni3IfRMGXTB1Tf1qqqV3frOmV4RyG94= +github.com/tinylib/msgp v1.1.1/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= +github.com/v3io/frames v0.13.9 h1:ucFRIIUWxlRuZitEMIK05pmw5dJfkEmVYCDa2QuID48= +github.com/v3io/frames v0.13.9/go.mod h1:7kl4avSwXUYIK9J3bUGBYO+bBOo2d82uOCj3LI9qZRo= github.com/v3io/sqlparser v0.0.0-20190306105200-4d7273501871 h1:myF4tU/HdFWU1UzMdf16cHRbownzsyvL7VKIHqkrSvo= github.com/v3io/sqlparser v0.0.0-20190306105200-4d7273501871/go.mod h1:QD2Bo64oyTWzeV8RFehXS0hZEDFgOK99/h2a6ErRu6E= github.com/v3io/v3io-go v0.3.0 h1:w25p6/ZpNN64g1S3wm3TD6WXe4aoYlPfNBApmAngXNo= @@ -85,72 +75,56 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC github.com/valyala/fasthttp v1.44.0 h1:R+gLUhldIsfg1HokMuQjdQ5bh9nuXHPIfvkYUu9eR5Q= github.com/valyala/fasthttp v1.44.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seBFc2uWtgiY= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= +go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= +go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= +go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= +go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= +go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= +go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= +go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= +go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= +go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= +golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= +golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= +golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= +golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= +golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/grpc v1.20.0 h1:DlsSIrgEBuZAUFJcta2B5i/lzeHHbnfkNFAfFXLVFYQ= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 h1:IkAfh6J/yllPtpYFU0zZN1hUPYdT0ogkBT/9hMxHjvg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM= +google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= zombiezen.com/go/capnproto2 v2.17.0+incompatible h1:sIoKPFGNlM38Qh+PBLa9Wzg1j99oInS/Qlk+5N/CHa4= zombiezen.com/go/capnproto2 v2.17.0+incompatible/go.mod h1:XO5Pr2SbXgqZwn0m0Ru54QBqpOf4K5AYBO+8LAOBQEQ= diff --git a/pkg/aggregate/aggregate_test.go b/pkg/aggregate/aggregate_test.go index 904c2ee7..178e7827 100644 --- a/pkg/aggregate/aggregate_test.go +++ b/pkg/aggregate/aggregate_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/appender/appender.go b/pkg/appender/appender.go index f03bc8a5..14cc4436 100644 --- a/pkg/appender/appender.go +++ b/pkg/appender/appender.go @@ -271,7 +271,7 @@ func (mc *MetricsCache) AddFast(ref uint64, t int64, v interface{}) error { metric, ok := mc.getMetric(ref) if !ok { // do not change error msg, it's parsed by prom - return fmt.Errorf(fmt.Sprintf("metric not found. ref=%v", ref)) + return fmt.Errorf("metric not found. ref=%v", ref) } err = metric.error() diff --git a/pkg/chunkenc/chunkenc_test.go b/pkg/chunkenc/chunkenc_test.go index 9b269fa8..36158b81 100644 --- a/pkg/chunkenc/chunkenc_test.go +++ b/pkg/chunkenc/chunkenc_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/chunkenc/vartype_test.go b/pkg/chunkenc/vartype_test.go index 5cc40597..3ca4b2c1 100644 --- a/pkg/chunkenc/vartype_test.go +++ b/pkg/chunkenc/vartype_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 1d01c825..06e8efdf 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/partmgr/partmgr_test.go b/pkg/partmgr/partmgr_test.go index c004d982..bc25b7c0 100644 --- a/pkg/partmgr/partmgr_test.go +++ b/pkg/partmgr/partmgr_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/pquerier/chunkIterator_test.go b/pkg/pquerier/chunkIterator_test.go index 07cb42e0..ee28d07e 100644 --- a/pkg/pquerier/chunkIterator_test.go +++ b/pkg/pquerier/chunkIterator_test.go @@ -1,4 +1,4 @@ -// +build integration +//go:build integration /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/pquerier/frames.go b/pkg/pquerier/frames.go index 2b05bf75..dbc1a832 100644 --- a/pkg/pquerier/frames.go +++ b/pkg/pquerier/frames.go @@ -91,7 +91,7 @@ func (fi *frameIterator) Next() bool { series := fi.ctx.frameList[fi.setIndex] // If raw series is nil - if series.isRawSeries && series.rawColumns[fi.seriesIndex] == nil { + if series.isRawSeries && any(series.rawColumns[fi.seriesIndex]) == nil { return fi.Next() } @@ -716,7 +716,7 @@ func (c *basicColumn) Name() string { // Len returns the number of elements func (c *basicColumn) Len() int { - if c.framesCol != nil { + if any(c.framesCol) != nil { return c.framesCol.Len() } return c.size diff --git a/pkg/pquerier/interpolate_test.go b/pkg/pquerier/interpolate_test.go index 8f082fe0..b761a6ec 100644 --- a/pkg/pquerier/interpolate_test.go +++ b/pkg/pquerier/interpolate_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/pquerier/select.go b/pkg/pquerier/select.go index a4e58b41..0802b200 100644 --- a/pkg/pquerier/select.go +++ b/pkg/pquerier/select.go @@ -340,7 +340,7 @@ func (queryCtx *selectQueryContext) processQueryResults(query *partQuery) error if !ok { encoding = chunkenc.EncXOR } else { - intEncoding, err := strconv.Atoi(encodingStr) + intEncoding, err := strconv.ParseInt(encodingStr, 10, 8) if err != nil { return fmt.Errorf("error parsing encoding type of chunk, got: %v, error: %v", encodingStr, err) } diff --git a/pkg/pquerier/selectQueryContext_test.go b/pkg/pquerier/selectQueryContext_test.go index 182c92dc..7f3754d3 100644 --- a/pkg/pquerier/selectQueryContext_test.go +++ b/pkg/pquerier/selectQueryContext_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/pquerier/sql_parser_test.go b/pkg/pquerier/sql_parser_test.go index 1a804421..4f9e963f 100644 --- a/pkg/pquerier/sql_parser_test.go +++ b/pkg/pquerier/sql_parser_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/querier/multipart_test.go b/pkg/querier/multipart_test.go index db522e7c..362d1b98 100644 --- a/pkg/querier/multipart_test.go +++ b/pkg/querier/multipart_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/tsdb/delete_integration_test.go b/pkg/tsdb/delete_integration_test.go index ec3efdfd..90785a74 100644 --- a/pkg/tsdb/delete_integration_test.go +++ b/pkg/tsdb/delete_integration_test.go @@ -1,4 +1,4 @@ -// +build integration +//go:build integration /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/tsdb/schema/schema_test.go b/pkg/tsdb/schema/schema_test.go index 593cee10..3f0d5372 100644 --- a/pkg/tsdb/schema/schema_test.go +++ b/pkg/tsdb/schema/schema_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/tsdb/tsdb_integration_test.go b/pkg/tsdb/tsdb_integration_test.go index 012478a1..93d2a12c 100644 --- a/pkg/tsdb/tsdb_integration_test.go +++ b/pkg/tsdb/tsdb_integration_test.go @@ -1,4 +1,4 @@ -// +build integration +//go:build integration /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/tsdb/tsdbtest/config_test.go b/pkg/tsdb/tsdbtest/config_test.go index 24a0f883..e0c9d1b8 100644 --- a/pkg/tsdb/tsdbtest/config_test.go +++ b/pkg/tsdb/tsdbtest/config_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/tsdb/tsdbtest/tsdbtest.go b/pkg/tsdb/tsdbtest/tsdbtest.go index 95377a01..3379ad96 100644 --- a/pkg/tsdb/tsdbtest/tsdbtest.go +++ b/pkg/tsdb/tsdbtest/tsdbtest.go @@ -34,8 +34,7 @@ import ( "github.com/v3io/v3io-tsdb/pkg/chunkenc" "github.com/v3io/v3io-tsdb/pkg/config" "github.com/v3io/v3io-tsdb/pkg/pquerier" - // nolint: golint - . "github.com/v3io/v3io-tsdb/pkg/tsdb" + "github.com/v3io/v3io-tsdb/pkg/tsdb" "github.com/v3io/v3io-tsdb/pkg/tsdb/tsdbtest/testutils" "github.com/v3io/v3io-tsdb/pkg/utils" ) @@ -164,12 +163,12 @@ type Sample struct { } func DeleteTSDB(t testing.TB, v3ioConfig *config.V3ioConfig) { - adapter, err := NewV3ioAdapter(v3ioConfig, nil, nil) + adapter, err := tsdb.NewV3ioAdapter(v3ioConfig, nil, nil) if err != nil { t.Fatalf("Failed to create an adapter. Reason: %s", err) } - if err := adapter.DeleteDB(DeleteParams{DeleteAll: true, IgnoreErrors: true}); err != nil { + if err := adapter.DeleteDB(tsdb.DeleteParams{DeleteAll: true, IgnoreErrors: true}); err != nil { t.Fatalf("Failed to delete a TSDB instance (table) on teardown. Reason: %s", err) } } @@ -180,7 +179,7 @@ func CreateTestTSDB(t testing.TB, v3ioConfig *config.V3ioConfig) { func CreateTestTSDBWithAggregates(t testing.TB, v3ioConfig *config.V3ioConfig, aggregates string) { schema := testutils.CreateSchema(t, aggregates) - if err := CreateTSDB(v3ioConfig, schema, nil); err != nil { + if err := tsdb.CreateTSDB(v3ioConfig, schema, nil); err != nil { v3ioConfigAsJSON, _ := json2.MarshalIndent(v3ioConfig, "", " ") t.Fatalf("Failed to create a TSDB instance (table). Reason: %v\nConfiguration:\n%s", err, string(v3ioConfigAsJSON)) } @@ -219,7 +218,7 @@ func SetUp(t testing.TB, testParams TestParams) func() { } } -func SetUpWithData(t *testing.T, testOpts TestParams) (*V3ioAdapter, func()) { +func SetUpWithData(t *testing.T, testOpts TestParams) (*tsdb.V3ioAdapter, func()) { teardown := SetUp(t, testOpts) adapter := InsertData(t, testOpts) return adapter, teardown @@ -228,7 +227,7 @@ func SetUpWithData(t *testing.T, testOpts TestParams) (*V3ioAdapter, func()) { func SetUpWithDBConfig(t *testing.T, schema *config.Schema, testParams TestParams) func() { v3ioConfig := testParams.V3ioConfig() v3ioConfig.TablePath = PrefixTablePath(fmt.Sprintf("%s-%d", t.Name(), time.Now().Nanosecond())) - if err := CreateTSDB(v3ioConfig, schema, nil); err != nil { + if err := tsdb.CreateTSDB(v3ioConfig, schema, nil); err != nil { v3ioConfigAsJSON, _ := json2.MarshalIndent(v3ioConfig, "", " ") t.Fatalf("Failed to create a TSDB instance (table). Reason: %s\nConfiguration:\n%s", err, string(v3ioConfigAsJSON)) } @@ -248,8 +247,8 @@ func SetUpWithDBConfig(t *testing.T, schema *config.Schema, testParams TestParam } } -func InsertData(t *testing.T, testParams TestParams) *V3ioAdapter { - adapter, err := NewV3ioAdapter(testParams.V3ioConfig(), nil, nil) +func InsertData(t *testing.T, testParams TestParams) *tsdb.V3ioAdapter { + adapter, err := tsdb.NewV3ioAdapter(testParams.V3ioConfig(), nil, nil) if err != nil { t.Fatalf("Failed to create a V3IO TSDB adapter. Reason: %s", err) } @@ -285,7 +284,7 @@ func InsertData(t *testing.T, testParams TestParams) *V3ioAdapter { return adapter } -func ValidateCountOfSamples(t testing.TB, adapter *V3ioAdapter, metricName string, expected int, startTimeMs, endTimeMs int64, queryAggStep int64) { +func ValidateCountOfSamples(t testing.TB, adapter *tsdb.V3ioAdapter, metricName string, expected int, startTimeMs, endTimeMs int64, queryAggStep int64) { var stepSize int64 if queryAggStep <= 0 { @@ -338,7 +337,7 @@ func ValidateCountOfSamples(t testing.TB, adapter *V3ioAdapter, metricName strin t.Logf("PASS: the metric-samples actual count matches the expected total count [%d(actualCount) == %d(expected)].", actualCount, expected) } -func ValidateRawData(t testing.TB, adapter *V3ioAdapter, metricName string, startTimeMs, endTimeMs int64, isValid func(*DataPoint, *DataPoint) bool) { +func ValidateRawData(t testing.TB, adapter *tsdb.V3ioAdapter, metricName string, startTimeMs, endTimeMs int64, isValid func(*DataPoint, *DataPoint) bool) { qry, err := adapter.Querier(context.TODO(), startTimeMs, endTimeMs) if err != nil { diff --git a/pkg/tsdb/v3iotsdb.go b/pkg/tsdb/v3iotsdb.go index b346403d..7a0f26b9 100644 --- a/pkg/tsdb/v3iotsdb.go +++ b/pkg/tsdb/v3iotsdb.go @@ -37,7 +37,7 @@ import ( "github.com/nuclio/logger" "github.com/pkg/errors" "github.com/v3io/v3io-go/pkg/dataplane" - "github.com/v3io/v3io-go/pkg/dataplane/http" + v3iohttp "github.com/v3io/v3io-go/pkg/dataplane/http" v3ioerrors "github.com/v3io/v3io-go/pkg/errors" "github.com/v3io/v3io-tsdb/pkg/aggregate" "github.com/v3io/v3io-tsdb/pkg/appender" @@ -100,7 +100,7 @@ func CreateTSDB(cfg *config.V3ioConfig, schema *config.Schema, container v3io.Co for i := 0; i < 8; i++ { _, err = container.GetObjectSync(&v3io.GetObjectInput{Path: path, DataPlaneInput: dataPlaneInput}) if err == nil { - return fmt.Errorf("A TSDB table already exists at path '" + cfg.TablePath + "'.") + return fmt.Errorf("A TSDB table already exists at path '%s'.", cfg.TablePath) } else if e, hasStatusCode := err.(v3ioerrors.ErrorWithStatusCode); hasStatusCode && e.StatusCode() != http.StatusNotFound { err = errors.Wrapf(err, "Failed to check TSDB schema at path '%s/%s/%s'.", cfg.WebAPIEndpoint, cfg.Container, path) lgr.Error(err) @@ -709,7 +709,7 @@ func getEncoding(itemToDelete v3io.Item) (chunkenc.Encoding, error) { if !ok { encoding = chunkenc.EncXOR } else { - intEncoding, err := strconv.Atoi(encodingStr) + intEncoding, err := strconv.ParseInt(encodingStr, 10, 8) if err != nil { return 0, fmt.Errorf("error parsing encoding type of chunk, got: %v, error: %v", encodingStr, err) } diff --git a/pkg/tsdb/v3iotsdb_integration_test.go b/pkg/tsdb/v3iotsdb_integration_test.go index 44bf25ab..9e09f97e 100644 --- a/pkg/tsdb/v3iotsdb_integration_test.go +++ b/pkg/tsdb/v3iotsdb_integration_test.go @@ -1,4 +1,4 @@ -// +build integration +//go:build integration /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/tsdbctl/add_test.go b/pkg/tsdbctl/add_test.go index 54768891..5c337d73 100644 --- a/pkg/tsdbctl/add_test.go +++ b/pkg/tsdbctl/add_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/tsdbctl/check.go b/pkg/tsdbctl/check.go index 0e9ede6b..cff1b6b9 100644 --- a/pkg/tsdbctl/check.go +++ b/pkg/tsdbctl/check.go @@ -324,7 +324,7 @@ func getSchema(cfg *config.V3ioConfig, container v3io.Container) (*config.Schema } func getEncoding(enc string) (chunkenc.Encoding, error) { - intEncoding, err := strconv.Atoi(enc) + intEncoding, err := strconv.ParseInt(enc, 10, 8) if err != nil { return 0, fmt.Errorf("error parsing encoding type, encoding type should be numberic, got: %v", enc) } diff --git a/pkg/tsdbctl/tsdbctl_test.go b/pkg/tsdbctl/tsdbctl_test.go index bb845de3..bb164388 100644 --- a/pkg/tsdbctl/tsdbctl_test.go +++ b/pkg/tsdbctl/tsdbctl_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd. diff --git a/pkg/utils/container.go b/pkg/utils/container.go index 2550317d..ff279b33 100644 --- a/pkg/utils/container.go +++ b/pkg/utils/container.go @@ -28,10 +28,10 @@ import ( "time" "github.com/nuclio/logger" - "github.com/nuclio/zap" + nucliozap "github.com/nuclio/zap" "github.com/pkg/errors" "github.com/v3io/v3io-go/pkg/dataplane" - "github.com/v3io/v3io-go/pkg/dataplane/http" + v3iohttp "github.com/v3io/v3io-go/pkg/dataplane/http" "github.com/v3io/v3io-tsdb/pkg/config" ) diff --git a/pkg/utils/timeutils_test.go b/pkg/utils/timeutils_test.go index 82900b33..1ba891f1 100644 --- a/pkg/utils/timeutils_test.go +++ b/pkg/utils/timeutils_test.go @@ -1,4 +1,4 @@ -// +build unit +//go:build unit /* Copyright 2018 Iguazio Systems Ltd.