Skip to content

Commit 33e2b5c

Browse files
you06ti-chi-bot
you06
authored and
ti-chi-bot
committed
This is an automated cherry-pick of pingcap#57282
Signed-off-by: ti-chi-bot <[email protected]>
1 parent c17c0df commit 33e2b5c

File tree

22 files changed

+988
-4
lines changed

22 files changed

+988
-4
lines changed

‎DEPS.bzl

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5819,13 +5819,23 @@ def go_deps():
58195819
name = "com_github_pingcap_kvproto",
58205820
build_file_proto_mode = "disable_global",
58215821
importpath = "github.com/pingcap/kvproto",
5822+
<<<<<<< HEAD
58225823
sha256 = "6857568a0131c268a444cb5b5717a3ecabf9b9633fd5cf5ca874cfbde0902b19",
58235824
strip_prefix = "github.com/pingcap/[email protected]",
58245825
urls = [
58255826
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20240208102409-a554af8ee11f.zip",
58265827
"http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20240208102409-a554af8ee11f.zip",
58275828
"https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20240208102409-a554af8ee11f.zip",
58285829
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20240208102409-a554af8ee11f.zip",
5830+
=======
5831+
sha256 = "d470ef683433f2c5bc7a1e610da44d516908d326a0341c07208af76a30f0d8a6",
5832+
strip_prefix = "github.com/pingcap/[email protected]",
5833+
urls = [
5834+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241113043844-e1fa7ea8c302.zip",
5835+
"http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241113043844-e1fa7ea8c302.zip",
5836+
"https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241113043844-e1fa7ea8c302.zip",
5837+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241113043844-e1fa7ea8c302.zip",
5838+
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282))
58295839
],
58305840
)
58315841
go_repository(
@@ -7041,13 +7051,23 @@ def go_deps():
70417051
name = "com_github_tikv_client_go_v2",
70427052
build_file_proto_mode = "disable_global",
70437053
importpath = "github.com/tikv/client-go/v2",
7054+
<<<<<<< HEAD
70447055
sha256 = "00c96385cb29901a20d4da163038eb5f5e554fca2ec9775f2b87f56a79252d47",
70457056
strip_prefix = "github.com/tikv/client-go/[email protected]",
70467057
urls = [
70477058
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240920100427-3725b31fa3c0.zip",
70487059
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240920100427-3725b31fa3c0.zip",
70497060
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240920100427-3725b31fa3c0.zip",
70507061
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240920100427-3725b31fa3c0.zip",
7062+
=======
7063+
sha256 = "4bc779621156c4ee6f46b57235da9c34c8ec0ee6d3be5f52e33da4c47098eeed",
7064+
strip_prefix = "github.com/tikv/client-go/[email protected]",
7065+
urls = [
7066+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241120024459-05d115b3e88b.zip",
7067+
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241120024459-05d115b3e88b.zip",
7068+
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241120024459-05d115b3e88b.zip",
7069+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241120024459-05d115b3e88b.zip",
7070+
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282))
70517071
],
70527072
)
70537073
go_repository(

‎errors.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2091,6 +2091,11 @@ error = '''
20912091
not implemented
20922092
'''
20932093

2094+
["kv:8178"]
2095+
error = '''
2096+
key is too large, the size of given key is %d
2097+
'''
2098+
20942099
["kv:9007"]
20952100
error = '''
20962101
Write conflict, txnStartTS=%d, conflictStartTS=%d, conflictCommitTS=%d, key=%s%s%s%s, reason=%s [try again later]

‎go.mod

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,15 @@ require (
8282
github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f
8383
github.com/pingcap/failpoint v0.0.0-20240527053858-9b3b6e34194a
8484
github.com/pingcap/fn v1.0.0
85+
<<<<<<< HEAD
8586
github.com/pingcap/kvproto v0.0.0-20240208102409-a554af8ee11f
8687
github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22
8788
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21
89+
=======
90+
github.com/pingcap/kvproto v0.0.0-20241113043844-e1fa7ea8c302
91+
github.com/pingcap/log v1.1.1-0.20240314023424-862ccc32f18d
92+
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5
93+
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282))
8894
github.com/pingcap/tidb/pkg/parser v0.0.0-20211011031125-9b13dc409c5e
8995
github.com/pingcap/tipb v0.0.0-20240507090649-2bf6bb0cb996
9096
github.com/pkg/errors v0.9.1
@@ -104,9 +110,16 @@ require (
104110
github.com/stretchr/testify v1.9.0
105111
github.com/tdakkota/asciicheck v0.2.0
106112
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
113+
<<<<<<< HEAD
107114
github.com/tikv/client-go/v2 v2.0.8-0.20240920100427-3725b31fa3c0
108115
github.com/tikv/pd/client v0.0.0-20240724132535-fcb34c90790c
109116
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966
117+
=======
118+
github.com/tidwall/btree v1.7.0
119+
github.com/tikv/client-go/v2 v2.0.8-0.20241120024459-05d115b3e88b
120+
github.com/tikv/pd/client v0.0.0-20241111073742-238d4d79ea31
121+
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a
122+
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282))
110123
github.com/twmb/murmur3 v1.1.6
111124
github.com/uber/jaeger-client-go v2.22.1+incompatible
112125
github.com/vbauerster/mpb/v7 v7.5.3

‎go.sum

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -813,8 +813,13 @@ github.com/pingcap/fn v1.0.0/go.mod h1:u9WZ1ZiOD1RpNhcI42RucFh/lBuzTu6rw88a+oF2Z
813813
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
814814
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
815815
github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO7l8IOcQG+t+ItJ3fEcrL5FxF0Wu+HrMy26w=
816+
<<<<<<< HEAD
816817
github.com/pingcap/kvproto v0.0.0-20240208102409-a554af8ee11f h1:2xvTjl4OrQY+XF38p8H7qVCXpaUYc5rLiYQhSd07aTI=
817818
github.com/pingcap/kvproto v0.0.0-20240208102409-a554af8ee11f/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
819+
=======
820+
github.com/pingcap/kvproto v0.0.0-20241113043844-e1fa7ea8c302 h1:ynwwqr0rLliSOJcx0wHMu4T/NiPXHlK48mk2DCrBKCI=
821+
github.com/pingcap/kvproto v0.0.0-20241113043844-e1fa7ea8c302/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
822+
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282))
818823
github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7/go.mod h1:8AanEdAHATuRurdGxZXBz0At+9avep+ub7U1AGYLIMM=
819824
github.com/pingcap/log v1.1.0/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
820825
github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22 h1:2SOzvGvE8beiC1Y4g9Onkvu6UmuBBOeWRGQEjJaT/JY=
@@ -997,12 +1002,23 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJf
9971002
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU=
9981003
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
9991004
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
1005+
<<<<<<< HEAD
10001006
github.com/tikv/client-go/v2 v2.0.8-0.20240920100427-3725b31fa3c0 h1:fRrgcL5JMtirxL+gp2/+pB6x1CkAb3kbaI7lnQU7NGI=
10011007
github.com/tikv/client-go/v2 v2.0.8-0.20240920100427-3725b31fa3c0/go.mod h1:37p0ryKaieJbBpVDWnaPi2ZS6UFqkgpsemBLkGX2FvM=
10021008
github.com/tikv/pd/client v0.0.0-20240724132535-fcb34c90790c h1:oZygf/SCdTUhjoHuZRE85EBgK0oA6LjikpWuJqqjM8U=
10031009
github.com/tikv/pd/client v0.0.0-20240724132535-fcb34c90790c/go.mod h1:NW6Af689Jw1FDxjq+WL0nqOdmQ1XT0ly2R1SIKfQuUw=
10041010
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M=
10051011
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ=
1012+
=======
1013+
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
1014+
github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
1015+
github.com/tikv/client-go/v2 v2.0.8-0.20241120024459-05d115b3e88b h1:/hmt2FCt34rCVBX9dswiSdHOkppP67VWaESryTxDKc8=
1016+
github.com/tikv/client-go/v2 v2.0.8-0.20241120024459-05d115b3e88b/go.mod h1:NI2GfVlB9n7DsIGCxrKcD4psrcuFNEV8m1BgyzK1Amc=
1017+
github.com/tikv/pd/client v0.0.0-20241111073742-238d4d79ea31 h1:oAYc4m5Eu1OY9ogJ103VO47AYPHvhtzbUPD8L8B67Qk=
1018+
github.com/tikv/pd/client v0.0.0-20241111073742-238d4d79ea31/go.mod h1:W5a0sDadwUpI9k8p7M77d3jo253ZHdmua+u4Ho4Xw8U=
1019+
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo=
1020+
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
1021+
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282))
10061022
github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
10071023
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
10081024
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=

‎pkg/errno/errcode.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,6 +1083,13 @@ const (
10831083
ErrLoadDataLocalUnsupportedOption = 8172
10841084
ErrLoadDataPreCheckFailed = 8173
10851085
ErrBRJobNotFound = 8174
1086+
<<<<<<< HEAD
1087+
=======
1088+
ErrMemoryExceedForQuery = 8175
1089+
ErrMemoryExceedForInstance = 8176
1090+
ErrDeleteNotFoundColumn = 8177
1091+
ErrKeyTooLarge = 8178
1092+
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282))
10861093

10871094
// Error codes used by TiDB ddl package
10881095
ErrUnsupportedDDLOperation = 8200

‎pkg/errno/errname.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,15 @@ var MySQLErrName = map[uint16]*mysql.ErrMessage{
10751075
ErrLoadDataInvalidOperation: mysql.Message("The current job status cannot perform the operation. %s", nil),
10761076
ErrLoadDataLocalUnsupportedOption: mysql.Message("Unsupported option for LOAD DATA LOCAL INFILE: %s", nil),
10771077
ErrLoadDataPreCheckFailed: mysql.Message("PreCheck failed: %s", nil),
1078+
<<<<<<< HEAD
1079+
=======
1080+
ErrMemoryExceedForQuery: mysql.Message("Your query has been cancelled due to exceeding the allowed memory limit for a single SQL query. Please try narrowing your query scope or increase the tidb_mem_quota_query limit and try again.[conn=%d]", nil),
1081+
ErrMemoryExceedForInstance: mysql.Message("Your query has been cancelled due to exceeding the allowed memory limit for the tidb-server instance and this query is currently using the most memory. Please try narrowing your query scope or increase the tidb_server_memory_limit and try again.[conn=%d]", nil),
1082+
ErrDeleteNotFoundColumn: mysql.Message("Delete can not find column %s for table %s", nil),
1083+
ErrKeyTooLarge: mysql.Message("key is too large, the size of given key is %d", nil),
1084+
1085+
ErrHTTPServiceError: mysql.Message("HTTP request failed with status %s", nil),
1086+
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282))
10781087

10791088
ErrWarnOptimizerHintInvalidInteger: mysql.Message("integer value is out of range in '%s'", nil),
10801089
ErrWarnOptimizerHintUnsupportedHint: mysql.Message("Optimizer hint %s is not supported by TiDB and is ignored", nil),

‎pkg/executor/adapter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ func (a *ExecStmt) handleStmtForeignKeyTrigger(ctx context.Context, e exec.Execu
612612
if stmtCtx.ForeignKeyTriggerCtx.HasFKCascades {
613613
// If the ExecStmt has foreign key cascade to be executed, we need call `StmtCommit` to commit the ExecStmt itself
614614
// change first.
615-
// Since `UnionScanExec` use `SnapshotIter` and `SnapshotGetter` to read txn mem-buffer, if we don't do `StmtCommit`,
615+
// Since `UnionScanExec` use `SnapshotIter` and `SnapshotGetter` to read txn mem-buffer, if we don't do `StmtCommit`,
616616
// then the fk cascade executor can't read the mem-buffer changed by the ExecStmt.
617617
a.Ctx.StmtCommit(ctx)
618618
}

‎pkg/executor/executor_pkg_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,11 @@ func TestBuildKvRangesForIndexJoinWithoutCwcAndWithMemoryTracker(t *testing.T) {
135135
}
136136

137137
require.Equal(t, 2*bytesConsumed1, bytesConsumed2)
138+
<<<<<<< HEAD
138139
require.Equal(t, int64(25570), bytesConsumed1)
140+
=======
141+
require.Equal(t, int64(23640), bytesConsumed1)
142+
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282))
139143
}
140144

141145
func generateIndexRange(vals ...int64) *ranger.Range {

0 commit comments

Comments
 (0)