diff --git a/.circleci/config.yml b/.circleci/config.yml index 8889b26aef0..7d1259a809c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ parameters: # when updating the go version, should also update the go version in go.mod description: docker tag for cross build container from quay.io . Created by https://github.com/influxdata/edge/tree/master/dockerfiles/cross-builder . type: string - default: go1.23.12-latest + default: go1.24.9-latest workflow: type: string diff --git a/client/influxdb.go b/client/influxdb.go index 795a1155e3b..8591ac618d7 100644 --- a/client/influxdb.go +++ b/client/influxdb.go @@ -408,7 +408,7 @@ func (c *Client) Write(bp BatchPoints) (*Response, error) { } if resp.StatusCode != http.StatusNoContent && resp.StatusCode != http.StatusOK { - var err = fmt.Errorf(string(body)) + var err = errors.New(string(body)) response.Err = err return &response, err } @@ -454,7 +454,7 @@ func (c *Client) WriteLineProtocol(data, database, retentionPolicy, precision, w } if resp.StatusCode != http.StatusNoContent && resp.StatusCode != http.StatusOK { - err := fmt.Errorf(string(body)) + err := errors.New(string(body)) response.Err = err return &response, err } diff --git a/cmd/influx_inspect/dumptsi/dumptsi.go b/cmd/influx_inspect/dumptsi/dumptsi.go index aa25a09cf10..0a4f9c1b26c 100644 --- a/cmd/influx_inspect/dumptsi/dumptsi.go +++ b/cmd/influx_inspect/dumptsi/dumptsi.go @@ -512,7 +512,7 @@ or it should specify one or more .tsi/.tsl files. If no flags are specified then summary stats are provided for each file. ` - fmt.Fprintf(cmd.Stdout, usage) + fmt.Fprint(cmd.Stdout, usage) } // deletedString returns "(deleted)" if v is true. diff --git a/cmd/influx_inspect/dumptsm/dumptsm.go b/cmd/influx_inspect/dumptsm/dumptsm.go index 3d6bc713fa6..adf642d8651 100644 --- a/cmd/influx_inspect/dumptsm/dumptsm.go +++ b/cmd/influx_inspect/dumptsm/dumptsm.go @@ -268,7 +268,7 @@ Usage: influx_inspect dumptsm [flags] Defaults to "false". ` - fmt.Fprintf(cmd.Stdout, usage) + fmt.Fprint(cmd.Stdout, usage) } type ShardDetails struct { diff --git a/cmd/influx_inspect/verify/tsm/verify.go b/cmd/influx_inspect/verify/tsm/verify.go index 6f89c3822b8..a03bd79fd2a 100644 --- a/cmd/influx_inspect/verify/tsm/verify.go +++ b/cmd/influx_inspect/verify/tsm/verify.go @@ -74,7 +74,7 @@ Usage: influx_inspect verify [flags] This check skips verification of block checksums. `, os.Getenv("HOME")) - fmt.Fprintf(cmd.Stdout, usage) + fmt.Fprint(cmd.Stdout, usage) } type verifyTSM struct { diff --git a/cmd/influx_tools/internal/format/binary/messagetype_string.go b/cmd/influx_tools/internal/format/binary/messagetype_string.go index 1ccc33841c4..76af0aa3a25 100644 --- a/cmd/influx_tools/internal/format/binary/messagetype_string.go +++ b/cmd/influx_tools/internal/format/binary/messagetype_string.go @@ -25,9 +25,9 @@ const _MessageType_name = "HeaderTypeBucketHeaderTypeBucketFooterTypeSeriesHeade var _MessageType_index = [...]uint8{0, 10, 26, 42, 58, 73, 90, 108, 125, 141, 157} func (i MessageType) String() string { - i -= 1 - if i >= MessageType(len(_MessageType_index)-1) { - return "MessageType(" + strconv.FormatInt(int64(i+1), 10) + ")" + idx := int(i) - 1 + if i < 1 || idx >= len(_MessageType_index)-1 { + return "MessageType(" + strconv.FormatInt(int64(i), 10) + ")" } - return _MessageType_name[_MessageType_index[i]:_MessageType_index[i+1]] + return _MessageType_name[_MessageType_index[idx]:_MessageType_index[idx+1]] } diff --git a/go.mod b/go.mod index d154636c168..9bc7959a5ce 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/influxdata/influxdb -go 1.23.0 +go 1.24.0 -toolchain go1.23.12 +toolchain go1.24.9 require ( collectd.org v0.3.0 @@ -45,14 +45,14 @@ require ( github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6 go.uber.org/multierr v1.6.0 go.uber.org/zap v1.16.0 - golang.org/x/crypto v0.36.0 + golang.org/x/crypto v0.43.0 golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 - golang.org/x/sync v0.12.0 - golang.org/x/sys v0.31.0 - golang.org/x/term v0.30.0 - golang.org/x/text v0.23.0 + golang.org/x/sync v0.17.0 + golang.org/x/sys v0.37.0 + golang.org/x/term v0.36.0 + golang.org/x/text v0.30.0 golang.org/x/time v0.5.0 - golang.org/x/tools v0.22.0 + golang.org/x/tools v0.38.0 google.golang.org/grpc v1.64.1 google.golang.org/protobuf v1.34.1 ) @@ -178,9 +178,10 @@ require ( go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/atomic v1.7.0 // indirect - golang.org/x/mod v0.18.0 // indirect - golang.org/x/net v0.38.0 // indirect - golang.org/x/oauth2 v0.21.0 // indirect + golang.org/x/mod v0.29.0 // indirect + golang.org/x/net v0.46.0 // indirect + golang.org/x/oauth2 v0.32.0 // indirect + golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gonum.org/v1/gonum v0.12.0 // indirect google.golang.org/api v0.183.0 // indirect diff --git a/go.sum b/go.sum index 8f89e8c2c5a..21d95f1918f 100644 --- a/go.sum +++ b/go.sum @@ -1128,8 +1128,8 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= +golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= +golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1186,8 +1186,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA= +golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1243,8 +1243,8 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= +golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1258,8 +1258,8 @@ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY= +golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1272,8 +1272,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/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.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= -golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1358,13 +1358,15 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU= +golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= -golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= +golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= +golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1375,8 +1377,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/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.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1464,8 +1466,8 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= -golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ= +golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs= 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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/kit/platform/id_test.go b/kit/platform/id_test.go index 045219d2b7b..d673c336602 100644 --- a/kit/platform/id_test.go +++ b/kit/platform/id_test.go @@ -85,7 +85,7 @@ func TestDecodeFromString(t *testing.T) { var id platform.ID err := id.DecodeFromString("020f755c3c082000") if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } want := []byte{48, 50, 48, 102, 55, 53, 53, 99, 51, 99, 48, 56, 50, 48, 48, 48} got, _ := id.Encode() @@ -93,10 +93,10 @@ func TestDecodeFromString(t *testing.T) { t.Errorf("got %s not equal to wanted %s", string(got), string(want)) } if id.String() != "020f755c3c082000" { - t.Errorf("expecting string representation to contain the right value") + t.Error("expecting string representation to contain the right value") } if !id.Valid() { - t.Errorf("expecting ID to be a valid one") + t.Error("expecting ID to be a valid one") } } @@ -113,10 +113,10 @@ func TestEncode(t *testing.T) { t.Errorf("encoding error") } if id.String() != "5ca1ab1eba5eba11" { - t.Errorf("expecting string representation to contain the right value") + t.Error("expecting string representation to contain the right value") } if !id.Valid() { - t.Errorf("expecting ID to be a valid one") + t.Error("expecting ID to be a valid one") } } @@ -124,7 +124,7 @@ func TestDecodeFromAllZeros(t *testing.T) { var id platform.ID err := id.Decode(make([]byte, platform.IDLength)) if err == nil { - t.Errorf("expecting all zeros ID to not be a valid ID") + t.Error("expecting all zeros ID to not be a valid ID") } } @@ -132,10 +132,10 @@ func TestDecodeFromShorterString(t *testing.T) { var id platform.ID err := id.DecodeFromString("020f75") if err == nil { - t.Errorf("expecting shorter inputs to error") + t.Error("expecting shorter inputs to error") } if id.String() != "" { - t.Errorf("expecting invalid ID to be serialized into empty string") + t.Error("expecting invalid ID to be serialized into empty string") } } @@ -143,10 +143,10 @@ func TestDecodeFromLongerString(t *testing.T) { var id platform.ID err := id.DecodeFromString("020f755c3c082000aaa") if err == nil { - t.Errorf("expecting shorter inputs to error") + t.Error("expecting shorter inputs to error") } if id.String() != "" { - t.Errorf("expecting invalid ID to be serialized into empty string") + t.Error("expecting invalid ID to be serialized into empty string") } } @@ -154,10 +154,10 @@ func TestDecodeFromEmptyString(t *testing.T) { var id platform.ID err := id.DecodeFromString("") if err == nil { - t.Errorf("expecting empty inputs to error") + t.Error("expecting empty inputs to error") } if id.String() != "" { - t.Errorf("expecting invalid ID to be serialized into empty string") + t.Error("expecting invalid ID to be serialized into empty string") } } @@ -165,18 +165,18 @@ func TestMarshalling(t *testing.T) { var id0 platform.ID _, err := json.Marshal(id0) if err == nil { - t.Errorf("expecting empty ID to not be a valid one") + t.Error("expecting empty ID to not be a valid one") } init := "ca55e77eca55e77e" id1, err := platform.IDFromString(init) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } serialized, err := json.Marshal(id1) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } var id2 platform.ID @@ -186,7 +186,7 @@ func TestMarshalling(t *testing.T) { bytes2, _ := id2.Encode() if !bytes.Equal(bytes1, bytes2) { - t.Errorf("error marshalling/unmarshalling ID") + t.Error("error marshalling/unmarshalling ID") } // When used as a map key, IDs must use their string encoding. @@ -215,11 +215,11 @@ func TestMarshalling(t *testing.T) { func TestValid(t *testing.T) { var id platform.ID if id.Valid() { - t.Errorf("expecting initial ID to be invalid") + t.Error("expecting initial ID to be invalid") } if platform.InvalidID() != 0 { - t.Errorf("expecting invalid ID to return a zero ID, thus invalid") + t.Error("expecting invalid ID to return a zero ID, thus invalid") } } diff --git a/models/fieldtype_string.go b/models/fieldtype_string.go index d8016e8bf3e..9ee4341a263 100644 --- a/models/fieldtype_string.go +++ b/models/fieldtype_string.go @@ -21,8 +21,9 @@ const _FieldType_name = "IntegerFloatBooleanStringEmptyUnsigned" var _FieldType_index = [...]uint8{0, 7, 12, 19, 25, 30, 38} func (i FieldType) String() string { - if i < 0 || i >= FieldType(len(_FieldType_index)-1) { + idx := int(i) - 0 + if i < 0 || idx >= len(_FieldType_index)-1 { return "FieldType(" + strconv.FormatInt(int64(i), 10) + ")" } - return _FieldType_name[_FieldType_index[i]:_FieldType_index[i+1]] + return _FieldType_name[_FieldType_index[idx]:_FieldType_index[idx+1]] } diff --git a/pkg/data/gen/precision_string.go b/pkg/data/gen/precision_string.go index e53b4712bad..1dc2f6cf39a 100644 --- a/pkg/data/gen/precision_string.go +++ b/pkg/data/gen/precision_string.go @@ -21,8 +21,9 @@ const _precision_name = "MillisecondNanosecondMicrosecondSecondMinuteHour" var _precision_index = [...]uint8{0, 11, 21, 32, 38, 44, 48} func (i precision) String() string { - if i >= precision(len(_precision_index)-1) { + idx := int(i) - 0 + if i < 0 || idx >= len(_precision_index)-1 { return "precision(" + strconv.FormatInt(int64(i), 10) + ")" } - return _precision_name[_precision_index[i]:_precision_index[i+1]] + return _precision_name[_precision_index[idx]:_precision_index[idx+1]] } diff --git a/tsdb/engine/tsm1/engine_internal_test.go b/tsdb/engine/tsm1/engine_internal_test.go index 80821ae6409..b3210e04914 100644 --- a/tsdb/engine/tsm1/engine_internal_test.go +++ b/tsdb/engine/tsm1/engine_internal_test.go @@ -51,7 +51,7 @@ func TestEngine_ConcurrentShardSnapshots(t *testing.T) { } err = sh.WritePoints(points, tsdb.NoopStatsTracker()) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } engineInterface, err := sh.Engine() diff --git a/tsdb/shard_test.go b/tsdb/shard_test.go index 598ffb54ce7..11304ef751d 100644 --- a/tsdb/shard_test.go +++ b/tsdb/shard_test.go @@ -69,13 +69,13 @@ func TestShardWriteAndIndex(t *testing.T) { err := sh.WritePoints([]models.Point{pt}, tsdb.NoopStatsTracker()) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } pt.SetTime(time.Unix(2, 3)) err = sh.WritePoints([]models.Point{pt}, tsdb.NoopStatsTracker()) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } validateIndex := func() { @@ -101,7 +101,7 @@ func TestShardWriteAndIndex(t *testing.T) { pt.SetTime(time.Unix(2, 6)) err = sh.WritePoints([]models.Point{pt}, tsdb.NoopStatsTracker()) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } } @@ -139,7 +139,7 @@ func TestShard_Open_CorruptFieldsIndex(t *testing.T) { err := sh.WritePoints([]models.Point{pt}, tsdb.NoopStatsTracker()) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } if err := sh.Close(); err != nil { @@ -197,7 +197,7 @@ func TestMaxSeriesLimit(t *testing.T) { err := sh.WritePoints(points, tsdb.NoopStatsTracker()) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } // Writing one more series should exceed the series limit. @@ -225,7 +225,7 @@ func TestMaxSeriesLimit(t *testing.T) { } } if !found { - t.Fatalf("statistics for shard not found") + t.Fatal("statistics for shard not found") } } } @@ -275,7 +275,7 @@ func TestShard_MaxTagValuesLimit(t *testing.T) { err := sh.WritePoints(points, tsdb.NoopStatsTracker()) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } // Writing one more series should exceed the series limit. @@ -411,7 +411,7 @@ func TestShardWriteAddNewField(t *testing.T) { err := sh.WritePoints([]models.Point{pt}, tsdb.NoopStatsTracker()) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } pt = models.MustNewPoint( @@ -423,7 +423,7 @@ func TestShardWriteAddNewField(t *testing.T) { err = sh.WritePoints([]models.Point{pt}, tsdb.NoopStatsTracker()) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } if got, exp := sh.SeriesN(), int64(1); got != exp { @@ -703,7 +703,7 @@ func TestShard_Close_RemoveIndex(t *testing.T) { err := sh.WritePoints([]models.Point{pt}, tsdb.NoopStatsTracker()) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } if got, exp := sh.SeriesN(), int64(1); got != exp { @@ -1054,15 +1054,15 @@ func TestShard_Disabled_WriteQuery(t *testing.T) { err := sh.WritePoints([]models.Point{pt}, tsdb.NoopStatsTracker()) if err == nil { - t.Fatalf("expected shard disabled error") + t.Fatal("expected shard disabled error") } if err != tsdb.ErrShardDisabled { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } m := &influxql.Measurement{Name: "cpu"} _, got := sh.CreateIterator(context.Background(), m, query.IteratorOptions{}) if err == nil { - t.Fatalf("expected shard disabled error") + t.Fatal("expected shard disabled error") } if exp := tsdb.ErrShardDisabled; got != exp { t.Fatalf("got %v, expected %v", got, exp) @@ -1717,7 +1717,7 @@ func TestMeasurementFieldSet_SaveLoad(t *testing.T) { fields = mf2.FieldsByString(measurement) field := fields.Field(fieldName) if field == nil { - t.Fatalf("field is null") + t.Fatal("field is null") } if got, exp := field.Type, influxql.Float; got != exp { @@ -1894,7 +1894,7 @@ func TestMeasurementFieldSet_DeleteEmpty(t *testing.T) { fields = mf2.FieldsByString(measurement) field := fields.Field(fieldName) if field == nil { - t.Fatalf("field is null") + t.Fatal("field is null") } if got, exp := field.Type, influxql.Float; got != exp {