dep(*): update tidb to include DM SchemaTracker fix (#11410) (#11545)

close #11408
pingcap · Sep 2, 2024 · cd2f3f3 · cd2f3f3
1 parent 96b5cce
commit cd2f3f3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/dm/syncer/expr_filter_group.go b/dm/syncer/expr_filter_group.go
@@ -181,7 +181,6 @@ func (g *ExprFilterGroup) ResetExprs(table *filter.Table) {
 // SkipDMLByExpression returns true when given row matches the expr, which means this row should be skipped.
 func SkipDMLByExpression(ctx sessionctx.Context, row []interface{}, expr expression.Expression, upstreamCols []*model.ColumnInfo) (bool, error) {
 	// TODO: add MetricsProxies
-	log.L().Debug("will evaluate the expression", zap.Stringer("expression", expr), zap.Any("raw row", row))
 	data, err := utils.AdjustBinaryProtocolForDatum(ctx, row, upstreamCols)
 	if err != nil {
 		return false, err

diff --git a/go.mod b/go.mod
@@ -64,9 +64,9 @@ require (
 	github.com/pingcap/kvproto v0.0.0-20240112060601-a0e3fbb1eeee
 	github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22
 	github.com/pingcap/sysutil v0.0.0-20220114020952-ea68d2dbf5b4
-	github.com/pingcap/tidb v1.1.0-beta.0.20240604073126-607c846f4ca9
+	github.com/pingcap/tidb v1.1.0-beta.0.20240830190641-7b2719933838
 	github.com/pingcap/tidb-tools v7.0.1-0.20231228094724-d6c7fc83380a+incompatible
-	github.com/pingcap/tidb/parser v0.0.0-20240604073126-607c846f4ca9
+	github.com/pingcap/tidb/parser v0.0.0-20240830190641-7b2719933838
 	github.com/prometheus/client_golang v1.13.0
 	github.com/prometheus/client_model v0.2.0
 	github.com/r3labs/diff v1.1.0
@@ -81,7 +81,7 @@ require (
 	github.com/swaggo/gin-swagger v1.2.0
 	github.com/swaggo/swag v1.6.6-0.20200529100950-7c765ddd0476
 	github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954
-	github.com/tikv/client-go/v2 v2.0.4-0.20240510070224-92eaf4613ea5
+	github.com/tikv/client-go/v2 v2.0.4-0.20240827021516-18287765af05
 	github.com/tikv/pd v1.1.0-beta.0.20220303060546-3695d8164800
 	github.com/tikv/pd/client v0.0.0-20230904040343-947701a32c05
 	github.com/tinylib/msgp v1.1.6

diff --git a/go.sum b/go.sum
@@ -1063,15 +1063,15 @@ github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d/go.mod h1:7j18ezaW
 github.com/pingcap/sysutil v0.0.0-20220114020952-ea68d2dbf5b4 h1:HYbcxtnkN3s5tqrZ/z3eJS4j3Db8wMphEm1q10lY/TM=
 github.com/pingcap/sysutil v0.0.0-20220114020952-ea68d2dbf5b4/go.mod h1:sDCsM39cGiv2vwunZkaFA917vVkqDTGSPbbV7z4Oops=
 github.com/pingcap/tidb v1.1.0-beta.0.20220511160835-98c31070d958/go.mod h1:luW4sIZoLHY3bCWuKqyqk2QgMvF+/M7nWOXf/me0+fY=
-github.com/pingcap/tidb v1.1.0-beta.0.20240604073126-607c846f4ca9 h1:Qbs0b/Rm/u08FnB1FD8nFDYR+E8s+Xi5NcEvevfT9zc=
-github.com/pingcap/tidb v1.1.0-beta.0.20240604073126-607c846f4ca9/go.mod h1:EPZAXeYYINMvQZEL49+D7Hz2Y0fLRzgZzD6mYN8IySE=
+github.com/pingcap/tidb v1.1.0-beta.0.20240830190641-7b2719933838 h1:8JCNao0kB6vloF6uek6zDef/Z18BaGyJ3tzNGrEnZjo=
+github.com/pingcap/tidb v1.1.0-beta.0.20240830190641-7b2719933838/go.mod h1:SiO7FDpNyfdQJeSsh5+PykoEbooC8rPRi0C3kbG7YjM=
 github.com/pingcap/tidb-dashboard v0.0.0-20220117082709-e8076b5c79ba/go.mod h1:4hk/3owVGWdvI9Kx6yCqqvM1T5PVgwyQNyMQxD3rwfc=
 github.com/pingcap/tidb-tools v7.0.1-0.20231228094724-d6c7fc83380a+incompatible h1:D4NV5MQhR3WZZzYITVPKrzAkqLK+ue9caUvfAcdAMsE=
 github.com/pingcap/tidb-tools v7.0.1-0.20231228094724-d6c7fc83380a+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=
 github.com/pingcap/tidb/parser v0.0.0-20211011031125-9b13dc409c5e/go.mod h1:e1MGCA9Sg3T8jid8PKAEq5eYVuMMCq4n8gJ+Kqp4Plg=
 github.com/pingcap/tidb/parser v0.0.0-20220511160835-98c31070d958/go.mod h1:ElJiub4lRy6UZDb+0JHDkGEdr6aOli+ykhyej7VCLoI=
-github.com/pingcap/tidb/parser v0.0.0-20240604073126-607c846f4ca9 h1:0XQ11b+M0g3PLJ5EaROfW2sAebSQCdv7olVrW8TH0wI=
-github.com/pingcap/tidb/parser v0.0.0-20240604073126-607c846f4ca9/go.mod h1:4/ED0HzbEZoW6gpk3+INU7TcpsG0DbuSwbxwm9q6nF4=
+github.com/pingcap/tidb/parser v0.0.0-20240830190641-7b2719933838 h1:dLJum15W7JRsrMMCUA0XfrrilyFmOuDMSku/3RTUDx8=
+github.com/pingcap/tidb/parser v0.0.0-20240830190641-7b2719933838/go.mod h1:4/ED0HzbEZoW6gpk3+INU7TcpsG0DbuSwbxwm9q6nF4=
 github.com/pingcap/tidb/pkg/parser v0.0.0-20231103042308-035ad5ccbe67 h1:m0RZ583HjzG3NweDi4xAcK54NBBPJh+zXp5Fp60dHtw=
 github.com/pingcap/tidb/pkg/parser v0.0.0-20231103042308-035ad5ccbe67/go.mod h1:yRkiqLFwIqibYg2P7h4bclHjHcJiIFRLKhGRyBcKYus=
 github.com/pingcap/tipb v0.0.0-20220215045658-d12dec7a7609/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs=
@@ -1276,8 +1276,8 @@ github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJH
 github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tikv/client-go/v2 v2.0.1-0.20220510032238-ff5e35ac2869/go.mod h1:0scaG+seu7L56apm+Gjz9vckyO7ABIzM6T7n00mrIXs=
-github.com/tikv/client-go/v2 v2.0.4-0.20240510070224-92eaf4613ea5 h1:5EFWY0ESuWKyCZBwFkZxD3/UO/p/M1dHw8lqDaiwTAo=
-github.com/tikv/client-go/v2 v2.0.4-0.20240510070224-92eaf4613ea5/go.mod h1:mmVCLP2OqWvQJPOIevQPZvGphzh/oq9vv8J5LDfpadQ=
+github.com/tikv/client-go/v2 v2.0.4-0.20240827021516-18287765af05 h1:dsB3wb0b7Fs4fhoPutSEW2GgQqPRsYt2lXIP9eRXUVs=
+github.com/tikv/client-go/v2 v2.0.4-0.20240827021516-18287765af05/go.mod h1:mmVCLP2OqWvQJPOIevQPZvGphzh/oq9vv8J5LDfpadQ=
 github.com/tikv/pd v1.1.0-beta.0.20220303060546-3695d8164800 h1:lIfIwqe1HPa0suhMpiI200nYxau+rXWXTqZxSGg1HS4=
 github.com/tikv/pd v1.1.0-beta.0.20220303060546-3695d8164800/go.mod h1:J/dj1zpEE9b7idgONGFttnXM+ncl88LmnkD/xDbq0hA=
 github.com/tikv/pd/client v0.0.0-20220307081149-841fa61e9710/go.mod h1:AtvppPwkiyUgQlR1W9qSqfTB+OsOIu19jDCOxOsPkmU=