Skip to content

Commit ea34956

Browse files
DoubleDiDoubleDi
authored
Merge pull request #189 from mailru/update-golang
update golang to 1.20
2 parents a1b09ec + 8ffd55a commit ea34956

File tree

7 files changed

+63
-48
lines changed

7 files changed

+63
-48
lines changed

Diff for: ‎.github/workflows/test.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ jobs:
1212
lint:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
16-
- name: golangci-lint
17-
uses: golangci/golangci-lint-action@v2
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
18+
- name: Run linter
19+
uses: golangci/golangci-lint-action@v6
1820
with:
1921
version: latest
2022

@@ -25,14 +27,19 @@ jobs:
2527
strategy:
2628
fail-fast: false
2729
matrix:
28-
go: ["1.15", "1.16", "1.17", "1.18"]
30+
go: ["1.20", "1.21", "1.22", "1.23"]
2931

3032
steps:
31-
- uses: actions/setup-go@v1
33+
- name: Checkout
34+
uses: actions/checkout@v4
35+
36+
- name: Set up Go
37+
uses: actions/setup-go@v5
3238
with:
3339
go-version: ${{ matrix.go }}
34-
- uses: actions/checkout@v2
35-
- run: go test -v -coverprofile=profile.cov ./...
40+
41+
- name: Run tests
42+
run: go test -v -coverprofile=profile.cov ./...
3643

3744
- name: Send coverage
3845
uses: shogo82148/actions-goveralls@v1

Diff for: ‎conn.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"errors"
99
"fmt"
1010
"io"
11-
"io/ioutil"
1211
"log"
1312
"net"
1413
"net/http"
@@ -220,7 +219,7 @@ func (c *conn) killQuery(req *http.Request) error {
220219
}
221220
if body != nil {
222221
// Drain body to enable connection reuse
223-
_, _ = io.Copy(ioutil.Discard, body)
222+
_, _ = io.Copy(io.Discard, body)
224223
body.Close()
225224
}
226225
return nil
@@ -259,7 +258,7 @@ func (c *conn) exec(ctx context.Context, query string, args []driver.Value) (dri
259258
body, err := c.doRequest(ctx, req)
260259
if body != nil {
261260
// Drain body to enable connection reuse
262-
_, _ = io.Copy(ioutil.Discard, body)
261+
_, _ = io.Copy(io.Discard, body)
263262
body.Close()
264263
}
265264
return emptyResult, err

Diff for: ‎conn_go18.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88
"database/sql/driver"
99
"fmt"
10-
"io/ioutil"
10+
"io"
1111
"strings"
1212
)
1313

@@ -37,7 +37,7 @@ func (c *conn) Ping(ctx context.Context) error {
3737
defer respBody.Close()
3838

3939
// drain the response body to check if we got expected `1`
40-
resp, err := ioutil.ReadAll(respBody)
40+
resp, err := io.ReadAll(respBody)
4141
if err != nil {
4242
return fmt.Errorf("ping: failed to read the response: %w", err)
4343
}

Diff for: ‎conn_test.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"context"
66
"database/sql"
77
"database/sql/driver"
8-
"io/ioutil"
8+
"io"
99
"net/http"
1010
"strings"
1111
"testing"
@@ -17,6 +17,7 @@ import (
1717
"go.opentelemetry.io/otel/propagation"
1818
"go.opentelemetry.io/otel/sdk/trace"
1919
oteltrace "go.opentelemetry.io/otel/trace"
20+
"go.opentelemetry.io/otel/trace/noop"
2021
)
2122

2223
var (
@@ -229,7 +230,7 @@ func (s *connSuite) TestBuildRequestReadonlyWithAuth() {
229230
s.Equal(http.MethodPost, req.Method)
230231
s.Equal(cn.url.String(), req.URL.String())
231232
s.Nil(req.URL.User)
232-
b, err := ioutil.ReadAll(req.Body)
233+
b, err := io.ReadAll(req.Body)
233234
s.Require().NoError(err)
234235
s.Equal("SELECT 1", string(b))
235236
}
@@ -400,7 +401,7 @@ func (s *connSuite) TestBuildRequestWithTraceContext() {
400401
},
401402
{
402403
name: "trace context with noop trace provider",
403-
traceProvider: oteltrace.NewNoopTracerProvider(),
404+
traceProvider: noop.NewTracerProvider(),
404405
propagator: propagation.TraceContext{},
405406
expectedTraceHeaderPresent: false,
406407
expectedValidSpan: false,
@@ -414,7 +415,7 @@ func (s *connSuite) TestBuildRequestWithTraceContext() {
414415
},
415416
{
416417
name: "trace context with noop provider and propagator",
417-
traceProvider: oteltrace.NewNoopTracerProvider(),
418+
traceProvider: noop.NewTracerProvider(),
418419
propagator: propagation.NewCompositeTextMapPropagator(),
419420
expectedTraceHeaderPresent: false,
420421
expectedValidSpan: false,
@@ -452,7 +453,7 @@ func (s *connSuite) TestBuildRequestParamsInterpolation() {
452453
cn := newConn(NewConfig())
453454
req, err := cn.buildRequest(context.Background(), query, make([]driver.Value, 0))
454455
if s.NoError(err) {
455-
body, e := ioutil.ReadAll(req.Body)
456+
body, e := io.ReadAll(req.Body)
456457
if s.NoError(e) {
457458
s.Equal(query, string(body))
458459
}
@@ -469,7 +470,7 @@ func (s *connSuite) TestRequestBodyGzipCompression() {
469470
gz, err := gzip.NewReader(req.Body)
470471
if s.NoError(err) {
471472
defer gz.Close()
472-
body, e := ioutil.ReadAll(gz)
473+
body, e := io.ReadAll(gz)
473474
if s.NoError(e) {
474475
s.Equal(query, string(body))
475476
}

Diff for: ‎go.mod

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
module github.com/mailru/go-clickhouse/v2
22

3+
go 1.20
4+
35
require (
4-
github.com/google/uuid v1.2.0
5-
github.com/stretchr/testify v1.7.1
6-
go.opentelemetry.io/otel v1.7.0
7-
go.opentelemetry.io/otel/sdk v1.7.0
8-
go.opentelemetry.io/otel/trace v1.7.0
6+
github.com/google/uuid v1.6.0
7+
github.com/stretchr/testify v1.9.0
8+
go.opentelemetry.io/otel v1.24.0
9+
go.opentelemetry.io/otel/sdk v1.24.0
10+
go.opentelemetry.io/otel/trace v1.24.0
911
)
1012

11-
go 1.16
13+
require (
14+
github.com/davecgh/go-spew v1.1.1 // indirect
15+
github.com/go-logr/logr v1.4.2 // indirect
16+
github.com/go-logr/stdr v1.2.2 // indirect
17+
github.com/pmezard/go-difflib v1.0.0 // indirect
18+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
19+
golang.org/x/sys v0.19.0 // indirect
20+
gopkg.in/yaml.v3 v3.0.1 // indirect
21+
)

Diff for: ‎go.sum

+21-22
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
2-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
4-
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
5-
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
4+
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
5+
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
66
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
77
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
8-
github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
9-
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
10-
github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
11-
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
8+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
9+
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
10+
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
1211
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1312
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
14-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
15-
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
16-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
17-
go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM=
18-
go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
19-
go.opentelemetry.io/otel/sdk v1.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0=
20-
go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU=
21-
go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o=
22-
go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
23-
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 h1:iGu644GcxtEcrInvDsQRCwJjtCIOlT2V7IRt6ah2Whw=
24-
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
25-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
13+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
14+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
15+
go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
16+
go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
17+
go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
18+
go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
19+
go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
20+
go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
21+
go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
22+
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
23+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
24+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2625
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2726
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
28-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
29-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
27+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
28+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

Diff for: ‎rows_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"database/sql/driver"
66
"io"
7-
"io/ioutil"
87
"reflect"
98
"testing"
109
"time"
@@ -42,7 +41,7 @@ func TestTextRows(t *testing.T) {
4241
return
4342
}
4443
assert.Equal(t, []driver.Value{int32(2), "world"}, dest)
45-
data, err := ioutil.ReadAll(rows.respBody)
44+
data, err := io.ReadAll(rows.respBody)
4645
if !assert.NoError(t, err) {
4746
return
4847
}

0 commit comments

Comments
 (0)