Skip to content

Commit fe31308

Browse files
hawkingreihawkingrei
authored
parser: update to go1.19 (pingcap#51032)
close pingcap#50765
1 parent f5e0799 commit fe31308

File tree

5 files changed

+40
-32
lines changed

5 files changed

+40
-32
lines changed

‎DEPS.bzl

+18-18
Original file line numberDiff line numberDiff line change
@@ -10139,13 +10139,13 @@ def go_deps():
1013910139
name = "org_golang_x_exp",
1014010140
build_file_proto_mode = "disable_global",
1014110141
importpath = "golang.org/x/exp",
10142-
sha256 = "430a7061a11f8ba407c95c28017d67f1169e5cba657912e5c34e9a930bd3d1be",
10143-
strip_prefix = "golang.org/x/exp@v0.0.0-20231206192017-f3f8817b8deb",
10142+
sha256 = "b5b6cede556511e8318cda042863a37fcd68e8241bd82f751c596dbdb78d449a",
10143+
strip_prefix = "golang.org/x/exp@v0.0.0-20240205201215-2c58cdc269a3",
1014410144
urls = [
10145-
"http://bazel-cache.pingcap.net:8080/gomod/golang.org/x/exp/org_golang_x_exp-v0.0.0-20231206192017-f3f8817b8deb.zip",
10146-
"http://ats.apps.svc/gomod/golang.org/x/exp/org_golang_x_exp-v0.0.0-20231206192017-f3f8817b8deb.zip",
10147-
"https://cache.hawkingrei.com/gomod/golang.org/x/exp/org_golang_x_exp-v0.0.0-20231206192017-f3f8817b8deb.zip",
10148-
"https://storage.googleapis.com/pingcapmirror/gomod/golang.org/x/exp/org_golang_x_exp-v0.0.0-20231206192017-f3f8817b8deb.zip",
10145+
"http://bazel-cache.pingcap.net:8080/gomod/golang.org/x/exp/org_golang_x_exp-v0.0.0-20240205201215-2c58cdc269a3.zip",
10146+
"http://ats.apps.svc/gomod/golang.org/x/exp/org_golang_x_exp-v0.0.0-20240205201215-2c58cdc269a3.zip",
10147+
"https://cache.hawkingrei.com/gomod/golang.org/x/exp/org_golang_x_exp-v0.0.0-20240205201215-2c58cdc269a3.zip",
10148+
"https://storage.googleapis.com/pingcapmirror/gomod/golang.org/x/exp/org_golang_x_exp-v0.0.0-20240205201215-2c58cdc269a3.zip",
1014910149
],
1015010150
)
1015110151
go_repository(
@@ -10412,13 +10412,13 @@ def go_deps():
1041210412
name = "org_modernc_sortutil",
1041310413
build_file_proto_mode = "disable_global",
1041410414
importpath = "modernc.org/sortutil",
10415-
sha256 = "0450e080b84a4964908698a9615c0629859ddc527a70f1e5c0f911836dbabc17",
10416-
strip_prefix = "modernc.org/sortutil@v1.1.1",
10415+
sha256 = "30f47ffd690ba68e88bcb7f2a1f3d61505580c0d62ba32c2bab5017077208f60",
10416+
strip_prefix = "modernc.org/sortutil@v1.2.0",
1041710417
urls = [
10418-
"http://bazel-cache.pingcap.net:8080/gomod/modernc.org/sortutil/org_modernc_sortutil-v1.1.1.zip",
10419-
"http://ats.apps.svc/gomod/modernc.org/sortutil/org_modernc_sortutil-v1.1.1.zip",
10420-
"https://cache.hawkingrei.com/gomod/modernc.org/sortutil/org_modernc_sortutil-v1.1.1.zip",
10421-
"https://storage.googleapis.com/pingcapmirror/gomod/modernc.org/sortutil/org_modernc_sortutil-v1.1.1.zip",
10418+
"http://bazel-cache.pingcap.net:8080/gomod/modernc.org/sortutil/org_modernc_sortutil-v1.2.0.zip",
10419+
"http://ats.apps.svc/gomod/modernc.org/sortutil/org_modernc_sortutil-v1.2.0.zip",
10420+
"https://cache.hawkingrei.com/gomod/modernc.org/sortutil/org_modernc_sortutil-v1.2.0.zip",
10421+
"https://storage.googleapis.com/pingcapmirror/gomod/modernc.org/sortutil/org_modernc_sortutil-v1.2.0.zip",
1042210422
],
1042310423
)
1042410424
go_repository(
@@ -10438,13 +10438,13 @@ def go_deps():
1043810438
name = "org_modernc_y",
1043910439
build_file_proto_mode = "disable_global",
1044010440
importpath = "modernc.org/y",
10441-
sha256 = "eeb1fb4b8988f45c9f6124b6b172ddfab89dbfe1dc48093c295c67401f37d564",
10442-
strip_prefix = "modernc.org/y@v1.0.9",
10441+
sha256 = "cce55de6a0fe8fa41f1bf95184316f02f90966a12a34bc38534d610920be4720",
10442+
strip_prefix = "modernc.org/y@v1.1.0",
1044310443
urls = [
10444-
"http://bazel-cache.pingcap.net:8080/gomod/modernc.org/y/org_modernc_y-v1.0.9.zip",
10445-
"http://ats.apps.svc/gomod/modernc.org/y/org_modernc_y-v1.0.9.zip",
10446-
"https://cache.hawkingrei.com/gomod/modernc.org/y/org_modernc_y-v1.0.9.zip",
10447-
"https://storage.googleapis.com/pingcapmirror/gomod/modernc.org/y/org_modernc_y-v1.0.9.zip",
10444+
"http://bazel-cache.pingcap.net:8080/gomod/modernc.org/y/org_modernc_y-v1.1.0.zip",
10445+
"http://ats.apps.svc/gomod/modernc.org/y/org_modernc_y-v1.1.0.zip",
10446+
"https://cache.hawkingrei.com/gomod/modernc.org/y/org_modernc_y-v1.1.0.zip",
10447+
"https://storage.googleapis.com/pingcapmirror/gomod/modernc.org/y/org_modernc_y-v1.1.0.zip",
1044810448
],
1044910449
)
1045010450
go_repository(

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ require (
128128
go.uber.org/mock v0.4.0
129129
go.uber.org/multierr v1.11.0
130130
go.uber.org/zap v1.26.0
131-
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb
131+
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3
132132
golang.org/x/net v0.20.0
133133
golang.org/x/oauth2 v0.16.0
134134
golang.org/x/sync v0.6.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1031,8 +1031,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0
10311031
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
10321032
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
10331033
golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
1034-
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
1035-
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
1034+
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo=
1035+
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
10361036
golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 h1:jWGQJV4niP+CCmFW9ekjA9Zx8vYORzOUH2/Nl5WPuLQ=
10371037
golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
10381038
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=

‎pkg/parser/go.mod

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module github.com/pingcap/tidb/pkg/parser
22

3+
go 1.19
4+
35
require (
46
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548
57
github.com/cznic/sortutil v0.0.0-20181122101858-f5f958428db8
@@ -10,27 +12,24 @@ require (
1012
github.com/pingcap/log v1.1.0
1113
github.com/stretchr/testify v1.8.4
1214
go.uber.org/goleak v1.2.0
13-
go.uber.org/zap v1.25.0
14-
golang.org/x/text v0.12.0
15+
go.uber.org/zap v1.26.0
16+
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3
17+
golang.org/x/text v0.14.0
1518
modernc.org/parser v1.1.0
16-
modernc.org/y v1.0.9
19+
modernc.org/y v1.1.0
1720
)
1821

1922
require (
2023
github.com/benbjohnson/clock v1.3.5 // indirect
2124
github.com/davecgh/go-spew v1.1.1 // indirect
22-
github.com/klauspost/compress v1.17.1 // indirect
2325
github.com/pmezard/go-difflib v1.0.0 // indirect
2426
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
2527
go.uber.org/atomic v1.11.0 // indirect
2628
go.uber.org/multierr v1.11.0 // indirect
27-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
2829
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
2930
gopkg.in/yaml.v3 v3.0.1 // indirect
3031
modernc.org/golex v1.1.0 // indirect
3132
modernc.org/mathutil v1.6.0 // indirect
32-
modernc.org/sortutil v1.1.1 // indirect
33+
modernc.org/sortutil v1.2.0 // indirect
3334
modernc.org/strutil v1.2.0 // indirect
3435
)
35-
36-
go 1.18

‎pkg/parser/go.sum

+12-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
1313
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1414
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
1515
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
16-
github.com/klauspost/compress v1.17.1 h1:NE3C767s2ak2bweCZo3+rdP4U/HoyVXLv/X9f2gPS5g=
17-
github.com/klauspost/compress v1.17.1/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
1816
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
1917
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
2018
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -57,10 +55,14 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
5755
go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
5856
go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
5957
go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
58+
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
59+
go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
6060
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
6161
golang.org/x/exp v0.0.0-20181106170214-d68db9428509/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
6262
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
6363
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
64+
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo=
65+
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
6466
golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
6567
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
6668
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -70,10 +72,12 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
7072
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
7173
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
7274
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
75+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
76+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
7377
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
7478
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
7579
golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
76-
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
80+
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
7781
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7882
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
7983
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -99,14 +103,19 @@ modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6
99103
modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
100104
modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
101105
modernc.org/parser v1.0.7/go.mod h1:kLYH8flGAy2R9lDD9pxB8U7pSUiwCawoPKzo/7SYZT0=
106+
modernc.org/parser v1.0.8/go.mod h1:gSb1YDm/lCtL9U4M6+HIk2JfFiGgguEJUjZlIdK3I0g=
102107
modernc.org/parser v1.1.0 h1:XoClYpoz2xHEDIteSQ7tICOTFcNwBI7XRCeghUS6SNI=
103108
modernc.org/parser v1.1.0/go.mod h1:CXl3OTJRZij8FeMpzI3Id/bjupHf0u9HSrCUP4Z9pbA=
104109
modernc.org/scanner v1.1.0/go.mod h1:pDSh3vhQZeHFCjpcSzhDsvDIDOku2b/DdagPGXkK35o=
105110
modernc.org/sortutil v1.1.1 h1:VQGxbQGcHaQeB/BX9TQjrHFmOA0bounO1X/jvOfRo6Q=
106111
modernc.org/sortutil v1.1.1/go.mod h1:DTj/8BqjEBLZFVPYvEGDfFFg94SsfPxQ70R+SQJ98qA=
112+
modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
113+
modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
107114
modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
108115
modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
109116
modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
110117
modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
111118
modernc.org/y v1.0.9 h1:U3EAg4VQmj2eoAUnMFcv+KXxVQFT19ZIA1mO1XX0b1s=
112119
modernc.org/y v1.0.9/go.mod h1:EjpZC9SxK4Fr+sF7KezoT/AKrl7MOnNO/kNrhxTeib4=
120+
modernc.org/y v1.1.0 h1:JdIvLry+rKeSsVNRCdr6YWYimwwNm0GXtzxid77VfWc=
121+
modernc.org/y v1.1.0/go.mod h1:Iz3BmyIS4OwAbwGaUS7cqRrLsSsfp2sFWtpzX+P4CsE=

0 commit comments

Comments
 (0)