From 2b0a30fe355ca523e2b6cd1c48b53a40d00ce193 Mon Sep 17 00:00:00 2001 From: GMHDBJD <35025882+GMHDBJD@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:21:28 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #10380 Signed-off-by: ti-chi-bot --- dm/tests/all_mode/conf/dm-task.yaml | 2 +- go.mod | 8 ++++++++ go.sum | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dm/tests/all_mode/conf/dm-task.yaml b/dm/tests/all_mode/conf/dm-task.yaml index 851519b4760..b675b937874 100644 --- a/dm/tests/all_mode/conf/dm-task.yaml +++ b/dm/tests/all_mode/conf/dm-task.yaml @@ -42,7 +42,7 @@ filters: # filter rules, mysql instance can ref rules in it user-filter-1: schema-pattern: "*" # pattern of the upstream schema name, wildcard characters (*?) are supported table-pattern: "*" # pattern of the upstream table name, wildcard characters (*?) are supported - events: ["truncate table", "drop table"] # ignore truncate/drop table ddl + events: ["truncate table", "drop table", "truncate"] # ignore truncate/drop table ddl action: Ignore mydumpers: diff --git a/go.mod b/go.mod index ee2f2b3ac3f..fd76b9e3767 100644 --- a/go.mod +++ b/go.mod @@ -68,11 +68,19 @@ require ( github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c github.com/pingcap/kvproto v0.0.0-20230925123611-87bebcc0d071 github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22 +<<<<<<< HEAD github.com/pingcap/tidb v1.1.0-beta.0.20231010115255-ec2731b8f539 github.com/pingcap/tidb-tools v0.0.0-20231010140451-6189b1bea2fd github.com/pingcap/tidb/parser v0.0.0-20231010115255-ec2731b8f539 github.com/prometheus/client_golang v1.16.0 github.com/prometheus/client_model v0.4.0 +======= + github.com/pingcap/tidb v1.1.0-beta.0.20231212043317-b478056bbf73 + github.com/pingcap/tidb-tools v0.0.0-20231228035519-c4bdf178b3d6 + github.com/pingcap/tidb/pkg/parser v0.0.0-20231212043317-b478056bbf73 + github.com/prometheus/client_golang v1.17.0 + github.com/prometheus/client_model v0.5.0 +>>>>>>> fdef38b920 (binlog-filter: log error instead of return it (#10380)) github.com/r3labs/diff v1.1.0 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/segmentio/kafka-go v0.4.41-0.20230526171612-f057b1d369cd diff --git a/go.sum b/go.sum index 6c06a6defdd..dd5753b79fe 100644 --- a/go.sum +++ b/go.sum @@ -1044,6 +1044,7 @@ github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22/go.mod h1:DWQW5jICDR github.com/pingcap/sysutil v0.0.0-20220114020952-ea68d2dbf5b4/go.mod h1:sDCsM39cGiv2vwunZkaFA917vVkqDTGSPbbV7z4Oops= github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21 h1:QV6jqlfOkh8hqvEAgwBZa+4bSgO0EeKC7s5c6Luam2I= github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21/go.mod h1:QYnjfA95ZaMefyl1NO8oPtKeb8pYUdnDVhQgf+qdpjM= +<<<<<<< HEAD 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.20231010115255-ec2731b8f539 h1:Pw+tqB5BeNxn8uRQh6XZgU/MmdaSQiXtioStsxiu7M4= github.com/pingcap/tidb v1.1.0-beta.0.20231010115255-ec2731b8f539/go.mod h1:K9GzvaQZ9ht52B81kDXqvtW8p5rkQmP8rgJ8AW8yXCo= @@ -1054,6 +1055,14 @@ github.com/pingcap/tidb/parser v0.0.0-20220511160835-98c31070d958/go.mod h1:ElJi github.com/pingcap/tidb/parser v0.0.0-20231010115255-ec2731b8f539 h1:q9m7W3fJRAgmIwRckzxxrqWX/QRuQrXnVJSc5do1New= github.com/pingcap/tidb/parser v0.0.0-20231010115255-ec2731b8f539/go.mod h1:cwq4bKUlftpWuznB+rqNwbN0xy6/i5SL/nYvEKeJn4s= github.com/pingcap/tipb v0.0.0-20220215045658-d12dec7a7609/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs= +======= +github.com/pingcap/tidb v1.1.0-beta.0.20231212043317-b478056bbf73 h1:mj3ewOCcI0z8NcE5KWCYmq8f+S+yeC77OuxSuLBU5sc= +github.com/pingcap/tidb v1.1.0-beta.0.20231212043317-b478056bbf73/go.mod h1:x3ROM4heOSAIf/nEVr9ac1+HfgkgydwQUrd8t5nFzjE= +github.com/pingcap/tidb-tools v0.0.0-20231228035519-c4bdf178b3d6 h1:NJQd14hU0pLj8vS+vYtgFw4bXrFIXa/HfMdxALHtgVU= +github.com/pingcap/tidb-tools v0.0.0-20231228035519-c4bdf178b3d6/go.mod h1:7m72uoBoTrr8JNNA7iFBH824j3clIJx34zlUWJ45Q6Y= +github.com/pingcap/tidb/pkg/parser v0.0.0-20231212043317-b478056bbf73 h1:9+OZA39uCJe4x2zzkM6Uv+bp8/93Ggp0S+YvTSvs35E= +github.com/pingcap/tidb/pkg/parser v0.0.0-20231212043317-b478056bbf73/go.mod h1:yRkiqLFwIqibYg2P7h4bclHjHcJiIFRLKhGRyBcKYus= +>>>>>>> fdef38b920 (binlog-filter: log error instead of return it (#10380)) github.com/pingcap/tipb v0.0.0-20230919054518-dfd7d194838f h1:NCiI4Wyu4GkViLGTu6cYcxt79LZ1SenBBQX1OwEV6Jg= github.com/pingcap/tipb v0.0.0-20230919054518-dfd7d194838f/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= From 01de3d263b5f1e981af04834cd013b0c68b3ac57 Mon Sep 17 00:00:00 2001 From: gmhdbjd Date: Tue, 20 Feb 2024 11:24:10 +0800 Subject: [PATCH 2/2] resolve conflicts --- go.mod | 16 +++++++--------- go.sum | 21 ++++++--------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index fd76b9e3767..ffeb3a1ea24 100644 --- a/go.mod +++ b/go.mod @@ -68,19 +68,11 @@ require ( github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c github.com/pingcap/kvproto v0.0.0-20230925123611-87bebcc0d071 github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22 -<<<<<<< HEAD github.com/pingcap/tidb v1.1.0-beta.0.20231010115255-ec2731b8f539 - github.com/pingcap/tidb-tools v0.0.0-20231010140451-6189b1bea2fd + github.com/pingcap/tidb-tools v0.0.0-20240220032153-0792ce9410ca github.com/pingcap/tidb/parser v0.0.0-20231010115255-ec2731b8f539 github.com/prometheus/client_golang v1.16.0 github.com/prometheus/client_model v0.4.0 -======= - github.com/pingcap/tidb v1.1.0-beta.0.20231212043317-b478056bbf73 - github.com/pingcap/tidb-tools v0.0.0-20231228035519-c4bdf178b3d6 - github.com/pingcap/tidb/pkg/parser v0.0.0-20231212043317-b478056bbf73 - github.com/prometheus/client_golang v1.17.0 - github.com/prometheus/client_model v0.5.0 ->>>>>>> fdef38b920 (binlog-filter: log error instead of return it (#10380)) github.com/r3labs/diff v1.1.0 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/segmentio/kafka-go v0.4.41-0.20230526171612-f057b1d369cd @@ -390,3 +382,9 @@ replace go.opencensus.io => go.opencensus.io v0.23.1-0.20220331163232-052120675f replace github.com/go-ldap/ldap/v3 v3.4.4 => github.com/yangkeao/ldap/v3 v3.4.5-0.20230421065457-369a3bab1117 replace github.com/tildeleb/hashland => leb.io/hashland v0.1.5 + +// TODO: `sourcegraph.com/sourcegraph/appdash` has been archived, and the original host has been removed. +// Please remove these dependencies. +replace sourcegraph.com/sourcegraph/appdash => github.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 + +replace sourcegraph.com/sourcegraph/appdash-data => github.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 diff --git a/go.sum b/go.sum index dd5753b79fe..bffe7141f73 100644 --- a/go.sum +++ b/go.sum @@ -1044,25 +1044,16 @@ github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22/go.mod h1:DWQW5jICDR github.com/pingcap/sysutil v0.0.0-20220114020952-ea68d2dbf5b4/go.mod h1:sDCsM39cGiv2vwunZkaFA917vVkqDTGSPbbV7z4Oops= github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21 h1:QV6jqlfOkh8hqvEAgwBZa+4bSgO0EeKC7s5c6Luam2I= github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21/go.mod h1:QYnjfA95ZaMefyl1NO8oPtKeb8pYUdnDVhQgf+qdpjM= -<<<<<<< HEAD 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.20231010115255-ec2731b8f539 h1:Pw+tqB5BeNxn8uRQh6XZgU/MmdaSQiXtioStsxiu7M4= github.com/pingcap/tidb v1.1.0-beta.0.20231010115255-ec2731b8f539/go.mod h1:K9GzvaQZ9ht52B81kDXqvtW8p5rkQmP8rgJ8AW8yXCo= -github.com/pingcap/tidb-tools v0.0.0-20231010140451-6189b1bea2fd h1:0BfNSfxiQgTD+YA4a3dmb7zR7nyVMOZB4qknn1y8t9s= -github.com/pingcap/tidb-tools v0.0.0-20231010140451-6189b1bea2fd/go.mod h1:Awem9vQiEdvfdGLEbO6HWjR1jh2vFOCjKkwZdoHXfVI= +github.com/pingcap/tidb-tools v0.0.0-20240220032153-0792ce9410ca h1:OLk9PSGTMsDoUGoafyNaXwzljaNJGZZtU2f/JYP2v8M= +github.com/pingcap/tidb-tools v0.0.0-20240220032153-0792ce9410ca/go.mod h1:Awem9vQiEdvfdGLEbO6HWjR1jh2vFOCjKkwZdoHXfVI= 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-20231010115255-ec2731b8f539 h1:q9m7W3fJRAgmIwRckzxxrqWX/QRuQrXnVJSc5do1New= github.com/pingcap/tidb/parser v0.0.0-20231010115255-ec2731b8f539/go.mod h1:cwq4bKUlftpWuznB+rqNwbN0xy6/i5SL/nYvEKeJn4s= github.com/pingcap/tipb v0.0.0-20220215045658-d12dec7a7609/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs= -======= -github.com/pingcap/tidb v1.1.0-beta.0.20231212043317-b478056bbf73 h1:mj3ewOCcI0z8NcE5KWCYmq8f+S+yeC77OuxSuLBU5sc= -github.com/pingcap/tidb v1.1.0-beta.0.20231212043317-b478056bbf73/go.mod h1:x3ROM4heOSAIf/nEVr9ac1+HfgkgydwQUrd8t5nFzjE= -github.com/pingcap/tidb-tools v0.0.0-20231228035519-c4bdf178b3d6 h1:NJQd14hU0pLj8vS+vYtgFw4bXrFIXa/HfMdxALHtgVU= -github.com/pingcap/tidb-tools v0.0.0-20231228035519-c4bdf178b3d6/go.mod h1:7m72uoBoTrr8JNNA7iFBH824j3clIJx34zlUWJ45Q6Y= -github.com/pingcap/tidb/pkg/parser v0.0.0-20231212043317-b478056bbf73 h1:9+OZA39uCJe4x2zzkM6Uv+bp8/93Ggp0S+YvTSvs35E= -github.com/pingcap/tidb/pkg/parser v0.0.0-20231212043317-b478056bbf73/go.mod h1:yRkiqLFwIqibYg2P7h4bclHjHcJiIFRLKhGRyBcKYus= ->>>>>>> fdef38b920 (binlog-filter: log error instead of return it (#10380)) github.com/pingcap/tipb v0.0.0-20230919054518-dfd7d194838f h1:NCiI4Wyu4GkViLGTu6cYcxt79LZ1SenBBQX1OwEV6Jg= github.com/pingcap/tipb v0.0.0-20230919054518-dfd7d194838f/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= @@ -1193,6 +1184,10 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:IJ3DuWHPTJrsqtIqjfdmPTELdTFGefvrOa2eTeRBleQ= +github.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:V952P4GGl1v/MMynLwxVdWEbSZJx+n0oOO3ljnez+WU= +github.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 h1:8ZnTA26bBOoPkAbbitKPgNlpw0Bwt7ZlpYgZWHWJR/w= +github.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67/go.mod h1:tNZjgbYncKL5HxvDULAr/mWDmFz4B7H8yrXEDlnoIiw= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -2142,9 +2137,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:ucqkfpjg9WzSUubAO62csmucvxl4/JeW3F4I4909XkM= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 h1:e1sMhtVq9AfcEy8AXNb8eSg6gbzfdpYhoNqnPJa+GzI= -sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67/go.mod h1:L5q+DGLGOQFpo1snNEkLOJT2d1YTW66rWNzatr3He1k= upper.io/db.v3 v3.7.1+incompatible h1:GiK/NmDUClH3LrZd54qj5OQsz8brGFv652QXyRXtg2U= upper.io/db.v3 v3.7.1+incompatible/go.mod h1:FgTdD24eBjJAbPKsQSiHUNgXjOR4Lub3u1UMHSIh82Y=