From a3046087c4619885436d8dba6a330e037cbf6c83 Mon Sep 17 00:00:00 2001 From: liaojianjun <36503113+Leavrth@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:40:48 +0800 Subject: [PATCH] *: change pingcap/parser to pingcap/tidb/parser (#2254) --- chaos/cases/schema.go | 4 +-- chaos/cases/stmt.go | 4 +-- chaos/cases/task.go | 2 +- dm/config/task.go | 2 +- dm/ctl/common/util.go | 2 +- dm/master/server_test.go | 6 ++-- dm/master/shardddl/optimist_test.go | 6 ++-- dm/worker/task_checker_test.go | 2 +- go.mod | 10 +++---- go.sum | 42 +++++++++++++-------------- loader/convert_data.go | 2 +- loader/db.go | 2 +- loader/lightning.go | 2 +- pkg/binlog/event/util.go | 4 +-- pkg/parser/common.go | 8 ++--- pkg/parser/common_test.go | 2 +- pkg/retry/errors.go | 2 +- pkg/schema/tracker.go | 6 ++-- pkg/schema/tracker_test.go | 2 +- pkg/shardddl/optimism/info.go | 2 +- pkg/shardddl/optimism/info_test.go | 6 ++-- pkg/shardddl/optimism/keeper_test.go | 4 +-- pkg/shardddl/optimism/lock.go | 4 +-- pkg/shardddl/optimism/lock_test.go | 6 ++-- pkg/shardddl/optimism/schema.go | 2 +- pkg/shardddl/optimism/schema_test.go | 2 +- pkg/utils/common.go | 4 +-- pkg/utils/common_test.go | 2 +- pkg/utils/db.go | 4 +-- pkg/utils/db_test.go | 2 +- relay/common/util.go | 4 +-- relay/common/util_test.go | 2 +- relay/relay.go | 2 +- relay/relay_test.go | 2 +- relay/transformer/transformer.go | 2 +- relay/transformer/transformer_test.go | 2 +- relay/writer/file.go | 2 +- relay/writer/file_test.go | 2 +- relay/writer/file_util.go | 2 +- relay/writer/file_util_test.go | 2 +- syncer/causality_test.go | 2 +- syncer/checkpoint.go | 4 +-- syncer/dbconn/upstream_db.go | 4 +-- syncer/ddl.go | 4 +-- syncer/ddl_test.go | 4 +-- syncer/dml.go | 6 ++-- syncer/dml_test.go | 10 +++---- syncer/error.go | 6 ++-- syncer/error_test.go | 2 +- syncer/expr_filter_group.go | 2 +- syncer/filter.go | 2 +- syncer/filter_test.go | 2 +- syncer/handle_error.go | 4 +-- syncer/job_test.go | 2 +- syncer/online-ddl-tools/online_ddl.go | 4 +-- syncer/optimist.go | 4 +-- syncer/schema.go | 6 ++-- syncer/shardddl/optimist.go | 2 +- syncer/shardddl/optimist_test.go | 6 ++-- syncer/syncer.go | 8 ++--- syncer/syncer_test.go | 2 +- syncer/util.go | 2 +- syncer/util_test.go | 6 ++-- 63 files changed, 132 insertions(+), 132 deletions(-) diff --git a/chaos/cases/schema.go b/chaos/cases/schema.go index 7028405880..2e56342c89 100644 --- a/chaos/cases/schema.go +++ b/chaos/cases/schema.go @@ -14,8 +14,8 @@ package main import ( - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" ) const ( diff --git a/chaos/cases/stmt.go b/chaos/cases/stmt.go index 07c9acc55d..5e8f27241c 100644 --- a/chaos/cases/stmt.go +++ b/chaos/cases/stmt.go @@ -17,8 +17,8 @@ import ( "math/rand" "github.com/chaos-mesh/go-sqlsmith" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" ) type dmlType int diff --git a/chaos/cases/task.go b/chaos/cases/task.go index 6fbeeba283..e2df7a9070 100644 --- a/chaos/cases/task.go +++ b/chaos/cases/task.go @@ -23,8 +23,8 @@ import ( "github.com/chaos-mesh/go-sqlsmith" "github.com/pingcap/errors" - "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb-tools/pkg/dbutil" + "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/dm/config/task.go b/dm/config/task.go index 496e08161b..435398ae6d 100644 --- a/dm/config/task.go +++ b/dm/config/task.go @@ -23,11 +23,11 @@ import ( "github.com/coreos/go-semver/semver" "github.com/dustin/go-humanize" - "github.com/pingcap/parser" bf "github.com/pingcap/tidb-tools/pkg/binlog-filter" "github.com/pingcap/tidb-tools/pkg/column-mapping" "github.com/pingcap/tidb-tools/pkg/filter" router "github.com/pingcap/tidb-tools/pkg/table-router" + "github.com/pingcap/tidb/parser" "go.uber.org/zap" "gopkg.in/yaml.v2" diff --git a/dm/ctl/common/util.go b/dm/ctl/common/util.go index bc61a9bfce..be89dd3d9b 100644 --- a/dm/ctl/common/util.go +++ b/dm/ctl/common/util.go @@ -29,8 +29,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/parser" toolutils "github.com/pingcap/tidb-tools/pkg/utils" + "github.com/pingcap/tidb/parser" "github.com/spf13/cobra" "go.etcd.io/etcd/clientv3" "go.uber.org/zap" diff --git a/dm/master/server_test.go b/dm/master/server_test.go index bb6267621f..046e7eec60 100644 --- a/dm/master/server_test.go +++ b/dm/master/server_test.go @@ -32,11 +32,11 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/model" toolutils "github.com/pingcap/tidb-tools/pkg/utils" tiddl "github.com/pingcap/tidb/ddl" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/sessionctx" tidbmock "github.com/pingcap/tidb/util/mock" "github.com/tikv/pd/pkg/tempurl" diff --git a/dm/master/shardddl/optimist_test.go b/dm/master/shardddl/optimist_test.go index 618dcc5e0e..4b8173f9b9 100644 --- a/dm/master/shardddl/optimist_test.go +++ b/dm/master/shardddl/optimist_test.go @@ -19,12 +19,12 @@ import ( "time" . "github.com/pingcap/check" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/dbutil" "github.com/pingcap/tidb-tools/pkg/schemacmp" tiddl "github.com/pingcap/tidb/ddl" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/sessionctx" "github.com/pingcap/tidb/util/mock" "go.etcd.io/etcd/clientv3" diff --git a/dm/worker/task_checker_test.go b/dm/worker/task_checker_test.go index cf4dabdfe9..aa60c5d8e2 100644 --- a/dm/worker/task_checker_test.go +++ b/dm/worker/task_checker_test.go @@ -18,7 +18,7 @@ import ( "github.com/pingcap/check" "github.com/pingcap/errors" - tmysql "github.com/pingcap/parser/mysql" + tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" "github.com/pingcap/dm/dm/config" diff --git a/go.mod b/go.mod index e091057367..3ab1e7cecc 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/pingcap/dm require ( github.com/BurntSushi/toml v0.3.1 github.com/DATA-DOG/go-sqlmock v1.5.0 - github.com/chaos-mesh/go-sqlsmith v0.0.0-20210914111832-b3d328d69449 + github.com/chaos-mesh/go-sqlsmith v0.0.0-20211025024535-03ae33408684 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e github.com/coreos/go-semver v0.3.0 github.com/deepmap/oapi-codegen v1.8.2 @@ -21,13 +21,13 @@ require ( github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d github.com/labstack/echo/v4 v4.4.0 github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712 - github.com/pingcap/dumpling v0.0.0-20211008101523-e13bfc29a093 + github.com/pingcap/dumpling v0.0.0-20211025035249-dc2cee7df4a1 github.com/pingcap/errors v0.11.5-0.20210513014640-40f9a1999b3b github.com/pingcap/failpoint v0.0.0-20210316064728-7acb0f0a3dfd github.com/pingcap/log v0.0.0-20210906054005-afc726e70354 - github.com/pingcap/parser v0.0.0-20211004012448-687005894c4e - github.com/pingcap/tidb v1.1.0-beta.0.20211011021924-2f9d591ef722 - github.com/pingcap/tidb-tools v5.2.0-alpha.0.20210727084616-915b22e4d42c+incompatible + github.com/pingcap/tidb v1.1.0-beta.0.20211025024448-36e694bfc536 + github.com/pingcap/tidb-tools v5.2.2-0.20211019062242-37a8bef2fa17+incompatible + github.com/pingcap/tidb/parser v0.0.0-20211025024448-36e694bfc536 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.5.1 github.com/rakyll/statik v0.1.6 diff --git a/go.sum b/go.sum index 3742438284..2813ecd41c 100644 --- a/go.sum +++ b/go.sum @@ -112,8 +112,8 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chaos-mesh/go-sqlsmith v0.0.0-20210914111832-b3d328d69449 h1:FR5qXi97Qf4T51qkJKBUPJeD08kJMO3S3or/oonDazY= -github.com/chaos-mesh/go-sqlsmith v0.0.0-20210914111832-b3d328d69449/go.mod h1:3laLQsbNYmnZZt7OtP6YZ5Mihf8Embfs201BxCI5b5g= +github.com/chaos-mesh/go-sqlsmith v0.0.0-20211025024535-03ae33408684 h1:0Enh5fMRp4pS/DY//eGF9X2s98O/fP79wRBH3bAB7Lo= +github.com/chaos-mesh/go-sqlsmith v0.0.0-20211025024535-03ae33408684/go.mod h1:VjxGQM2bcHchm+RMFrn+r66K0jW0qd3wPiCdw/IJ+cE= github.com/cheggaaa/pb/v3 v3.0.8 h1:bC8oemdChbke2FHIIGy9mn4DPJ2caZYQnfbRqwmdCoA= github.com/cheggaaa/pb/v3 v3.0.8/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA= github.com/cheynewallace/tabby v1.1.1/go.mod h1:Pba/6cUL8uYqvOc9RkyvFbHGrQ9wShyrn6/S/1OYVys= @@ -215,6 +215,7 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= +github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -607,8 +608,8 @@ github.com/pingcap/check v0.0.0-20191107115940-caf2b9e6ccf4/go.mod h1:PYMCGwN0JH github.com/pingcap/check v0.0.0-20191216031241-8a5a85928f12/go.mod h1:PYMCGwN0JHjoqGr3HrZoD+b8Tgx8bKnArhSq8YVzUMc= github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712 h1:R8gStypOBmpnHEx1qi//SaqxJVI4inOqljg/Aj5/390= github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712/go.mod h1:PYMCGwN0JHjoqGr3HrZoD+b8Tgx8bKnArhSq8YVzUMc= -github.com/pingcap/dumpling v0.0.0-20211008101523-e13bfc29a093 h1:mBvWJxlVXDJ41h8U1OZmtzEUG1HFxxcWymp9M1BHg2M= -github.com/pingcap/dumpling v0.0.0-20211008101523-e13bfc29a093/go.mod h1:nfwRDefndWbtYYsjVI3jOBqyH3PgHRX0hdshNicMy5o= +github.com/pingcap/dumpling v0.0.0-20211025035249-dc2cee7df4a1 h1:ivchAmico+rkqbdboAX3KOidlGJEp/x1IH697U0/cZk= +github.com/pingcap/dumpling v0.0.0-20211025035249-dc2cee7df4a1/go.mod h1:o0a2u0xBlyY0zqFxd/NxAPKNKTHLIDXehymMnVbJYOE= github.com/pingcap/errcode v0.3.0 h1:IF6LC/4+b1KNwrMlr2rBTUrojFPMexXBcDWZSpNwxjg= github.com/pingcap/errcode v0.3.0/go.mod h1:4b2X8xSqxIroj/IZ9MX/VGZhAwc11wB9wRIzHvz6SeM= github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= @@ -632,8 +633,9 @@ github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO github.com/pingcap/kvproto v0.0.0-20200411081810-b85805c9476c/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/kvproto v0.0.0-20210219064844-c1844a4775d6/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/kvproto v0.0.0-20210805052247-76981389e818/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= -github.com/pingcap/kvproto v0.0.0-20210806074406-317f69fb54b4 h1:4EUpHzPFHwleKkVALyMqQbQcNziPZvU+vhUT9Wzj93E= -github.com/pingcap/kvproto v0.0.0-20210806074406-317f69fb54b4/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= +github.com/pingcap/kvproto v0.0.0-20210915062418-0f5764a128ad/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= +github.com/pingcap/kvproto v0.0.0-20211011042309-a4518fcacbc8 h1:IBNpJoFfn8BHhqyeKuAuVnYpViQE6/LOXFtDxuQPbqA= +github.com/pingcap/kvproto v0.0.0-20211011042309-a4518fcacbc8/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20200511115504-543df19646ad/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20201112100606-8f1e84a3abc8/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= @@ -643,24 +645,24 @@ github.com/pingcap/log v0.0.0-20210906054005-afc726e70354 h1:SvWCbCPh1YeHd9yQLks github.com/pingcap/log v0.0.0-20210906054005-afc726e70354/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4= github.com/pingcap/parser v0.0.0-20210415081931-48e7f467fd74/go.mod h1:xZC8I7bug4GJ5KtHhgAikjTfU4kBv1Sbo3Pf1MZ6lVw= github.com/pingcap/parser v0.0.0-20210525032559-c37778aff307/go.mod h1:xZC8I7bug4GJ5KtHhgAikjTfU4kBv1Sbo3Pf1MZ6lVw= -github.com/pingcap/parser v0.0.0-20210907051057-948434fa20e4/go.mod h1:Ek0mLKEqUGnQqBw1JnYrJQxsguU433DU68yUbsoeJ7s= -github.com/pingcap/parser v0.0.0-20211004012448-687005894c4e h1:dPMDpj+7ng9qEWoT3n6qjpB1ohz79uTLVM6ILW+ZMT0= -github.com/pingcap/parser v0.0.0-20211004012448-687005894c4e/go.mod h1:+xcMiiZzdIktT/Nqdfm81dkECJ2EPuoAYywd57py4Pk= github.com/pingcap/sysutil v0.0.0-20200206130906-2bfa6dc40bcd/go.mod h1:EB/852NMQ+aRKioCpToQ94Wl7fktV+FNnxf3CX/TTXI= github.com/pingcap/sysutil v0.0.0-20210315073920-cc0985d983a3/go.mod h1:tckvA041UWP+NqYzrJ3fMgC/Hw9wnmQ/tUkp/JaHly8= github.com/pingcap/sysutil v0.0.0-20210730114356-fcd8a63f68c5 h1:7rvAtZe/ZUzOKzgriNPQoBNvleJXBk4z7L3Z47+tS98= github.com/pingcap/sysutil v0.0.0-20210730114356-fcd8a63f68c5/go.mod h1:XsOaV712rUk63aOEKYP9PhXTIE3FMNHmC2r1wX5wElY= -github.com/pingcap/tidb v1.1.0-beta.0.20210914080841-89617e20b2c0/go.mod h1:MSg0d2+iJI/d3mUOcLV82GLpw5+jNGq21Z8qcHqBI/g= -github.com/pingcap/tidb v1.1.0-beta.0.20210914112841-6ebfe8aa4257/go.mod h1:MSg0d2+iJI/d3mUOcLV82GLpw5+jNGq21Z8qcHqBI/g= -github.com/pingcap/tidb v1.1.0-beta.0.20211011021924-2f9d591ef722 h1:Cb5Tk1tadtPpMu+za8L3JY/tDBe2zoY+EObwvElYVnU= -github.com/pingcap/tidb v1.1.0-beta.0.20211011021924-2f9d591ef722/go.mod h1:WQHMalPfxjTrWMSSsKsPaJsM4ErDr2/ZOF4Gpd70CGQ= +github.com/pingcap/tidb v1.1.0-beta.0.20211023132847-efa94595c071/go.mod h1:Ci7ABF58a4jn6YtaHi7655jP409edqC2JxWWFRqOubg= +github.com/pingcap/tidb v1.1.0-beta.0.20211025024448-36e694bfc536 h1:J7+2HNfbM19h1x3MScwWiq8dti6zWUtAhPgx+4i/9Bk= +github.com/pingcap/tidb v1.1.0-beta.0.20211025024448-36e694bfc536/go.mod h1:nAzxGAGr6oO6muhwcjwI4EgT23lRZB7bqgaYqiFLVhQ= github.com/pingcap/tidb-dashboard v0.0.0-20210312062513-eef5d6404638/go.mod h1:OzFN8H0EDMMqeulPhPMw2i2JaiZWOKFQ7zdRPhENNgo= github.com/pingcap/tidb-dashboard v0.0.0-20210716172320-2226872e3296/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ= github.com/pingcap/tidb-tools v5.0.3+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM= -github.com/pingcap/tidb-tools v5.2.0-alpha.0.20210727084616-915b22e4d42c+incompatible h1:3UusiiE+cbOYzjMT3oxk2gN3lUT0ccjMiul51EEvZZc= -github.com/pingcap/tidb-tools v5.2.0-alpha.0.20210727084616-915b22e4d42c+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM= -github.com/pingcap/tipb v0.0.0-20210802080519-94b831c6db55 h1:oxOovwOzm7VD37XpDo9NUtfGddZMwLpjtaQOxAq6HKg= -github.com/pingcap/tipb v0.0.0-20210802080519-94b831c6db55/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs= +github.com/pingcap/tidb-tools v5.2.2-0.20211019062242-37a8bef2fa17+incompatible h1:c7+izmker91NkjkZ6FgTlmD4k1A5FLOAq+li6Ki2/GY= +github.com/pingcap/tidb-tools v5.2.2-0.20211019062242-37a8bef2fa17+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-20211023132847-efa94595c071/go.mod h1:e1MGCA9Sg3T8jid8PKAEq5eYVuMMCq4n8gJ+Kqp4Plg= +github.com/pingcap/tidb/parser v0.0.0-20211025024448-36e694bfc536 h1:pwacrgkhtURkMdwZfq1Qz4NzYxs+ktLHRVojZ8nI7nY= +github.com/pingcap/tidb/parser v0.0.0-20211025024448-36e694bfc536/go.mod h1:e1MGCA9Sg3T8jid8PKAEq5eYVuMMCq4n8gJ+Kqp4Plg= +github.com/pingcap/tipb v0.0.0-20211008080435-3fd327dfce0e h1:fZY5T65QWiPc9noQJ1UkdwejZyBZjNfxzSyTcBjKrEU= +github.com/pingcap/tipb v0.0.0-20211008080435-3fd327dfce0e/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -799,9 +801,8 @@ github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU= github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/sjson v1.1.2 h1:NC5okI+tQ8OG/oyzchvwXXxRxCV/FVdhODbPKkQ25jQ= github.com/tidwall/sjson v1.1.2/go.mod h1:SEzaDwxiPzKzNfUEO4HbYF/m4UCSJDsGgNqsS1LvdoY= -github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210913094925-a8fa8acd44e7/go.mod h1:KwtZXt0JD+bP9bWW2ka0ir3Wp3oTEfZUTh22bs2sI4o= -github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210926100628-3cc2459779ca h1:aE/y7lkygl716M6eIos95BKjM1mGew+EoLWRQAXDoAE= -github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210926100628-3cc2459779ca/go.mod h1:KwtZXt0JD+bP9bWW2ka0ir3Wp3oTEfZUTh22bs2sI4o= +github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211011083157-49c8dd23f1f0 h1:DZdVqFVe+r7M0tSZ2LdqeY+UNplR1DSLCdGtH1AKi5M= +github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211011083157-49c8dd23f1f0/go.mod h1:00plYwQsQ5kBUmafHO+JkjznGgFaBokMZl82TZIbsQk= github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d/go.mod h1:Jw9KG11C/23Rr7DW4XWQ7H5xOgGZo6DFL1OKAF4+Igw= github.com/tikv/pd v1.1.0-beta.0.20210818082359-acba1da0018d h1:AFm1Dzw+QRUevWRfrFp45CPPkuK/zdSWcfxI10z+WVE= github.com/tikv/pd v1.1.0-beta.0.20210818082359-acba1da0018d/go.mod h1:rammPjeZgpvfrQRPkijcx8tlxF1XM5+m6kRXrkDzCAA= @@ -815,7 +816,6 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966 h1:j6JEOq github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/twmb/murmur3 v1.1.3 h1:D83U0XYKcHRYwYIpBKf3Pks91Z0Byda/9SJ8B6EMRcA= github.com/twmb/murmur3 v1.1.3/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= -github.com/uber-go/atomic v1.4.0/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= github.com/uber/jaeger-client-go v2.22.1+incompatible h1:NHcubEkVbahf9t3p75TOCR83gdUHXjRJvjoBh1yACsM= github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= diff --git a/loader/convert_data.go b/loader/convert_data.go index 9d3e899f1b..5013d65200 100644 --- a/loader/convert_data.go +++ b/loader/convert_data.go @@ -28,9 +28,9 @@ import ( "github.com/pingcap/dm/pkg/utils" "github.com/pingcap/errors" - "github.com/pingcap/parser/ast" cm "github.com/pingcap/tidb-tools/pkg/column-mapping" router "github.com/pingcap/tidb-tools/pkg/table-router" + "github.com/pingcap/tidb/parser/ast" ) func bytes2str(bs []byte) string { diff --git a/loader/db.go b/loader/db.go index d6de85f760..a581386225 100644 --- a/loader/db.go +++ b/loader/db.go @@ -21,8 +21,8 @@ import ( "github.com/go-sql-driver/mysql" "github.com/pingcap/failpoint" - tmysql "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb-tools/pkg/dbutil" + tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" "github.com/pingcap/dm/dm/config" diff --git a/loader/lightning.go b/loader/lightning.go index d87fb8005a..27edc3a593 100644 --- a/loader/lightning.go +++ b/loader/lightning.go @@ -20,11 +20,11 @@ import ( "github.com/docker/go-units" "github.com/pingcap/failpoint" - "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb-tools/pkg/dbutil" "github.com/pingcap/tidb/br/pkg/lightning" "github.com/pingcap/tidb/br/pkg/lightning/common" lcfg "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/parser/mysql" "go.etcd.io/etcd/clientv3" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/pkg/binlog/event/util.go b/pkg/binlog/event/util.go index acffde25e1..b205fb765d 100644 --- a/pkg/binlog/event/util.go +++ b/pkg/binlog/event/util.go @@ -28,8 +28,8 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/parser" - "github.com/pingcap/parser/mysql" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/dm/pkg/terror" ) diff --git a/pkg/parser/common.go b/pkg/parser/common.go index 5b201b1d75..3e89f45471 100644 --- a/pkg/parser/common.go +++ b/pkg/parser/common.go @@ -20,11 +20,11 @@ import ( "github.com/pingcap/dm/pkg/terror" "github.com/pingcap/dm/pkg/utils" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/format" - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/format" + "github.com/pingcap/tidb/parser/model" _ "github.com/pingcap/tidb/types/parser_driver" // for import parser driver "go.uber.org/zap" ) diff --git a/pkg/parser/common_test.go b/pkg/parser/common_test.go index 2fcd4d2133..f0adc5b384 100644 --- a/pkg/parser/common_test.go +++ b/pkg/parser/common_test.go @@ -17,8 +17,8 @@ import ( "testing" . "github.com/pingcap/check" - "github.com/pingcap/parser" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser" "github.com/pingcap/dm/pkg/terror" "github.com/pingcap/dm/pkg/utils" diff --git a/pkg/retry/errors.go b/pkg/retry/errors.go index ed70343e2b..1c0e2f00a5 100644 --- a/pkg/retry/errors.go +++ b/pkg/retry/errors.go @@ -18,7 +18,7 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/pingcap/errors" - tmysql "github.com/pingcap/parser/mysql" + tmysql "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/dm/pkg/terror" ) diff --git a/pkg/schema/tracker.go b/pkg/schema/tracker.go index 50ebc06a1b..cd204256fa 100644 --- a/pkg/schema/tracker.go +++ b/pkg/schema/tracker.go @@ -19,15 +19,15 @@ import ( "strings" "github.com/pingcap/errors" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/model" - "github.com/pingcap/parser/terror" "github.com/pingcap/tidb-tools/pkg/filter" tidbConfig "github.com/pingcap/tidb/config" "github.com/pingcap/tidb/ddl" "github.com/pingcap/tidb/domain" "github.com/pingcap/tidb/infoschema" "github.com/pingcap/tidb/kv" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tidb/parser/terror" "github.com/pingcap/tidb/session" "github.com/pingcap/tidb/sessionctx/variable" "github.com/pingcap/tidb/store/mockstore" diff --git a/pkg/schema/tracker_test.go b/pkg/schema/tracker_test.go index cc9345511d..4253942197 100644 --- a/pkg/schema/tracker_test.go +++ b/pkg/schema/tracker_test.go @@ -25,8 +25,8 @@ import ( "github.com/DATA-DOG/go-sqlmock" . "github.com/pingcap/check" "github.com/pingcap/log" - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser/model" "go.uber.org/zap/zapcore" "github.com/pingcap/dm/pkg/conn" diff --git a/pkg/shardddl/optimism/info.go b/pkg/shardddl/optimism/info.go index d964d810b6..13cd821066 100644 --- a/pkg/shardddl/optimism/info.go +++ b/pkg/shardddl/optimism/info.go @@ -18,8 +18,8 @@ import ( "encoding/json" "fmt" - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/schemacmp" + "github.com/pingcap/tidb/parser/model" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/mvcc/mvccpb" diff --git a/pkg/shardddl/optimism/info_test.go b/pkg/shardddl/optimism/info_test.go index 1471d0d600..c85a9d10e7 100644 --- a/pkg/shardddl/optimism/info_test.go +++ b/pkg/shardddl/optimism/info_test.go @@ -21,10 +21,10 @@ import ( "time" . "github.com/pingcap/check" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/model" tiddl "github.com/pingcap/tidb/ddl" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/sessionctx" "github.com/pingcap/tidb/util/mock" "go.etcd.io/etcd/clientv3" diff --git a/pkg/shardddl/optimism/keeper_test.go b/pkg/shardddl/optimism/keeper_test.go index 403a6b7223..a6fb82522f 100644 --- a/pkg/shardddl/optimism/keeper_test.go +++ b/pkg/shardddl/optimism/keeper_test.go @@ -17,9 +17,9 @@ import ( "testing" . "github.com/pingcap/check" - "github.com/pingcap/parser" - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/schemacmp" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/util/mock" "go.etcd.io/etcd/integration" diff --git a/pkg/shardddl/optimism/lock.go b/pkg/shardddl/optimism/lock.go index 683de1bc81..072a68a6ae 100644 --- a/pkg/shardddl/optimism/lock.go +++ b/pkg/shardddl/optimism/lock.go @@ -17,9 +17,9 @@ import ( "fmt" "sync" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" "github.com/pingcap/tidb-tools/pkg/schemacmp" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" "go.etcd.io/etcd/clientv3" "go.uber.org/zap" diff --git a/pkg/shardddl/optimism/lock_test.go b/pkg/shardddl/optimism/lock_test.go index a231344175..3c1502c2d8 100644 --- a/pkg/shardddl/optimism/lock_test.go +++ b/pkg/shardddl/optimism/lock_test.go @@ -17,10 +17,10 @@ import ( "testing" . "github.com/pingcap/check" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/schemacmp" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/util/mock" "go.etcd.io/etcd/integration" diff --git a/pkg/shardddl/optimism/schema.go b/pkg/shardddl/optimism/schema.go index 2d81368718..8673b8cb40 100644 --- a/pkg/shardddl/optimism/schema.go +++ b/pkg/shardddl/optimism/schema.go @@ -16,7 +16,7 @@ package optimism import ( "encoding/json" - "github.com/pingcap/parser/model" + "github.com/pingcap/tidb/parser/model" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3/clientv3util" diff --git a/pkg/shardddl/optimism/schema_test.go b/pkg/shardddl/optimism/schema_test.go index 1fc7a97d2c..f5f3ba582a 100644 --- a/pkg/shardddl/optimism/schema_test.go +++ b/pkg/shardddl/optimism/schema_test.go @@ -15,7 +15,7 @@ package optimism import ( . "github.com/pingcap/check" - "github.com/pingcap/parser" + "github.com/pingcap/tidb/parser" "github.com/pingcap/tidb/util/mock" ) diff --git a/pkg/utils/common.go b/pkg/utils/common.go index 093deaaf3e..ada5b0eb51 100644 --- a/pkg/utils/common.go +++ b/pkg/utils/common.go @@ -23,11 +23,11 @@ import ( "time" "github.com/pingcap/failpoint" - "github.com/pingcap/parser/model" - tmysql "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb-tools/pkg/dbutil" "github.com/pingcap/tidb-tools/pkg/filter" router "github.com/pingcap/tidb-tools/pkg/table-router" + "github.com/pingcap/tidb/parser/model" + tmysql "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/tidb/sessionctx" "github.com/pingcap/tidb/sessionctx/variable" "github.com/pingcap/tidb/table" diff --git a/pkg/utils/common_test.go b/pkg/utils/common_test.go index 5b2b8de634..7178733651 100644 --- a/pkg/utils/common_test.go +++ b/pkg/utils/common_test.go @@ -20,9 +20,9 @@ import ( "github.com/DATA-DOG/go-sqlmock" . "github.com/pingcap/check" - "github.com/pingcap/parser" "github.com/pingcap/tidb-tools/pkg/filter" router "github.com/pingcap/tidb-tools/pkg/table-router" + "github.com/pingcap/tidb/parser" ) var _ = Suite(&testCommonSuite{}) diff --git a/pkg/utils/db.go b/pkg/utils/db.go index 948126c972..80fede3aee 100644 --- a/pkg/utils/db.go +++ b/pkg/utils/db.go @@ -28,10 +28,10 @@ import ( "github.com/go-sql-driver/mysql" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/parser" - tmysql "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb-tools/pkg/check" "github.com/pingcap/tidb-tools/pkg/dbutil" + "github.com/pingcap/tidb/parser" + tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" "github.com/pingcap/dm/pkg/gtid" diff --git a/pkg/utils/db_test.go b/pkg/utils/db_test.go index 2dbd7fa145..bb67465080 100644 --- a/pkg/utils/db_test.go +++ b/pkg/utils/db_test.go @@ -24,7 +24,7 @@ import ( "github.com/go-sql-driver/mysql" . "github.com/pingcap/check" "github.com/pingcap/errors" - tmysql "github.com/pingcap/parser/mysql" + tmysql "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/dm/pkg/gtid" ) diff --git a/relay/common/util.go b/relay/common/util.go index 241c0f6ad2..bbbe0886e0 100644 --- a/relay/common/util.go +++ b/relay/common/util.go @@ -14,8 +14,8 @@ package common import ( - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" parserpkg "github.com/pingcap/dm/pkg/parser" "github.com/pingcap/dm/pkg/utils" diff --git a/relay/common/util_test.go b/relay/common/util_test.go index a4e11aa1c6..d0e23a211b 100644 --- a/relay/common/util_test.go +++ b/relay/common/util_test.go @@ -17,7 +17,7 @@ import ( "testing" "github.com/pingcap/check" - "github.com/pingcap/parser" + "github.com/pingcap/tidb/parser" ) func TestSuite(t *testing.T) { diff --git a/relay/relay.go b/relay/relay.go index db40f900c8..34e9f859f1 100644 --- a/relay/relay.go +++ b/relay/relay.go @@ -27,8 +27,8 @@ import ( "github.com/go-mysql-org/go-mysql/replication" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/parser" toolutils "github.com/pingcap/tidb-tools/pkg/utils" + "github.com/pingcap/tidb/parser" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/relay/relay_test.go b/relay/relay_test.go index b58eee9935..28ad060d97 100644 --- a/relay/relay_test.go +++ b/relay/relay_test.go @@ -29,7 +29,7 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/parser" + "github.com/pingcap/tidb/parser" "github.com/pingcap/dm/dm/config" "github.com/pingcap/dm/pkg/binlog/event" diff --git a/relay/transformer/transformer.go b/relay/transformer/transformer.go index 4811750eba..974e3b0c4a 100644 --- a/relay/transformer/transformer.go +++ b/relay/transformer/transformer.go @@ -16,7 +16,7 @@ package transformer import ( "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/parser" + "github.com/pingcap/tidb/parser" "github.com/pingcap/dm/relay/common" ) diff --git a/relay/transformer/transformer_test.go b/relay/transformer/transformer_test.go index 216dcf78ed..97d7cd50e8 100644 --- a/relay/transformer/transformer_test.go +++ b/relay/transformer/transformer_test.go @@ -20,7 +20,7 @@ import ( "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" "github.com/pingcap/check" - "github.com/pingcap/parser" + "github.com/pingcap/tidb/parser" "github.com/pingcap/dm/pkg/binlog/event" "github.com/pingcap/dm/pkg/gtid" diff --git a/relay/writer/file.go b/relay/writer/file.go index bdc69007ab..658dbcfe48 100644 --- a/relay/writer/file.go +++ b/relay/writer/file.go @@ -23,7 +23,7 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" "github.com/pingcap/failpoint" - "github.com/pingcap/parser" + "github.com/pingcap/tidb/parser" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/relay/writer/file_test.go b/relay/writer/file_test.go index 3a09f23b1a..0c959a99bb 100644 --- a/relay/writer/file_test.go +++ b/relay/writer/file_test.go @@ -25,7 +25,7 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" "github.com/pingcap/check" - "github.com/pingcap/parser" + "github.com/pingcap/tidb/parser" "github.com/pingcap/dm/pkg/binlog/common" "github.com/pingcap/dm/pkg/binlog/event" diff --git a/relay/writer/file_util.go b/relay/writer/file_util.go index dfd76808cf..937dfc8587 100644 --- a/relay/writer/file_util.go +++ b/relay/writer/file_util.go @@ -24,7 +24,7 @@ import ( gmysql "github.com/go-mysql-org/go-mysql/mysql" "github.com/go-mysql-org/go-mysql/replication" "github.com/google/uuid" - "github.com/pingcap/parser" + "github.com/pingcap/tidb/parser" "github.com/pingcap/dm/pkg/binlog/event" "github.com/pingcap/dm/pkg/binlog/reader" diff --git a/relay/writer/file_util_test.go b/relay/writer/file_util_test.go index 8443ced7d0..add3fe95e0 100644 --- a/relay/writer/file_util_test.go +++ b/relay/writer/file_util_test.go @@ -25,7 +25,7 @@ import ( "github.com/go-mysql-org/go-mysql/replication" "github.com/pingcap/check" "github.com/pingcap/errors" - "github.com/pingcap/parser" + "github.com/pingcap/tidb/parser" "github.com/pingcap/dm/pkg/binlog/event" "github.com/pingcap/dm/pkg/gtid" diff --git a/syncer/causality_test.go b/syncer/causality_test.go index 7b555028f4..2e4988fb41 100644 --- a/syncer/causality_test.go +++ b/syncer/causality_test.go @@ -17,8 +17,8 @@ import ( "time" . "github.com/pingcap/check" - "github.com/pingcap/parser" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser" "github.com/pingcap/tidb/util/mock" "github.com/pingcap/dm/dm/config" diff --git a/syncer/checkpoint.go b/syncer/checkpoint.go index fc1edd3ca2..a57d277227 100644 --- a/syncer/checkpoint.go +++ b/syncer/checkpoint.go @@ -39,10 +39,10 @@ import ( "github.com/go-mysql-org/go-mysql/mysql" "github.com/pingcap/failpoint" - "github.com/pingcap/parser/model" - tmysql "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb-tools/pkg/dbutil" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser/model" + tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" ) diff --git a/syncer/dbconn/upstream_db.go b/syncer/dbconn/upstream_db.go index 982815ca64..d9609ab774 100644 --- a/syncer/dbconn/upstream_db.go +++ b/syncer/dbconn/upstream_db.go @@ -18,9 +18,9 @@ import ( "github.com/go-mysql-org/go-mysql/mysql" "github.com/pingcap/failpoint" - "github.com/pingcap/parser" - tmysql "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser" + tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" "github.com/pingcap/dm/dm/config" diff --git a/syncer/ddl.go b/syncer/ddl.go index 43fdf30fe7..0971933e43 100644 --- a/syncer/ddl.go +++ b/syncer/ddl.go @@ -17,9 +17,9 @@ import ( "time" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" "go.uber.org/zap" tcontext "github.com/pingcap/dm/pkg/context" diff --git a/syncer/ddl_test.go b/syncer/ddl_test.go index bc163f5d3a..1468ca16dc 100644 --- a/syncer/ddl_test.go +++ b/syncer/ddl_test.go @@ -23,11 +23,11 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/go-sql-driver/mysql" . "github.com/pingcap/check" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" "github.com/pingcap/tidb-tools/pkg/filter" router "github.com/pingcap/tidb-tools/pkg/table-router" "github.com/pingcap/tidb/br/pkg/mock" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" "go.uber.org/zap" "github.com/pingcap/dm/dm/config" diff --git a/syncer/dml.go b/syncer/dml.go index 2317204049..9af48a14b7 100644 --- a/syncer/dml.go +++ b/syncer/dml.go @@ -19,11 +19,11 @@ import ( "strconv" "strings" - "github.com/pingcap/parser/model" - "github.com/pingcap/parser/mysql" - "github.com/pingcap/parser/types" "github.com/pingcap/tidb-tools/pkg/filter" "github.com/pingcap/tidb/expression" + "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tidb/parser/types" "go.uber.org/zap" "github.com/pingcap/dm/pkg/log" diff --git a/syncer/dml_test.go b/syncer/dml_test.go index 026991405f..841e342ec8 100644 --- a/syncer/dml_test.go +++ b/syncer/dml_test.go @@ -18,13 +18,13 @@ import ( "strings" . "github.com/pingcap/check" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/model" - "github.com/pingcap/parser/mysql" - "github.com/pingcap/parser/types" "github.com/pingcap/tidb-tools/pkg/filter" tiddl "github.com/pingcap/tidb/ddl" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tidb/parser/types" "github.com/pingcap/tidb/sessionctx" "github.com/pingcap/tidb/util/mock" ) diff --git a/syncer/error.go b/syncer/error.go index ba8d732127..2af0cbdcd3 100644 --- a/syncer/error.go +++ b/syncer/error.go @@ -20,13 +20,13 @@ import ( "github.com/go-sql-driver/mysql" "github.com/pingcap/errors" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" - tmysql "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb-tools/pkg/dbutil" tddl "github.com/pingcap/tidb/ddl" "github.com/pingcap/tidb/errno" "github.com/pingcap/tidb/infoschema" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" + tmysql "github.com/pingcap/tidb/parser/mysql" "go.uber.org/zap" tcontext "github.com/pingcap/dm/pkg/context" diff --git a/syncer/error_test.go b/syncer/error_test.go index 70551cdd5f..beee35e233 100644 --- a/syncer/error_test.go +++ b/syncer/error_test.go @@ -20,9 +20,9 @@ import ( "github.com/go-sql-driver/mysql" . "github.com/pingcap/check" "github.com/pingcap/errors" - tmysql "github.com/pingcap/parser/mysql" "github.com/pingcap/tidb/errno" "github.com/pingcap/tidb/infoschema" + tmysql "github.com/pingcap/tidb/parser/mysql" "github.com/pingcap/dm/pkg/conn" tcontext "github.com/pingcap/dm/pkg/context" diff --git a/syncer/expr_filter_group.go b/syncer/expr_filter_group.go index 7b7d7c3782..4a8e6380e2 100644 --- a/syncer/expr_filter_group.go +++ b/syncer/expr_filter_group.go @@ -14,10 +14,10 @@ package syncer import ( - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/dbutil" "github.com/pingcap/tidb-tools/pkg/filter" "github.com/pingcap/tidb/expression" + "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/planner/core" "github.com/pingcap/tidb/util/chunk" "go.uber.org/zap" diff --git a/syncer/filter.go b/syncer/filter.go index 36261280f2..5dc5bdf217 100644 --- a/syncer/filter.go +++ b/syncer/filter.go @@ -15,9 +15,9 @@ package syncer import ( "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/parser/ast" bf "github.com/pingcap/tidb-tools/pkg/binlog-filter" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser/ast" "github.com/pingcap/dm/pkg/terror" "github.com/pingcap/dm/pkg/utils" diff --git a/syncer/filter_test.go b/syncer/filter_test.go index 58ad3ce12f..bad1d983dc 100644 --- a/syncer/filter_test.go +++ b/syncer/filter_test.go @@ -20,9 +20,9 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/go-mysql-org/go-mysql/replication" . "github.com/pingcap/check" - "github.com/pingcap/parser" bf "github.com/pingcap/tidb-tools/pkg/binlog-filter" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser" "github.com/pingcap/dm/dm/config" "github.com/pingcap/dm/pkg/conn" diff --git a/syncer/handle_error.go b/syncer/handle_error.go index 64613187bf..415bb9c554 100644 --- a/syncer/handle_error.go +++ b/syncer/handle_error.go @@ -17,10 +17,10 @@ import ( "context" "fmt" - "github.com/pingcap/parser" + "github.com/pingcap/tidb/parser" "github.com/go-mysql-org/go-mysql/replication" - "github.com/pingcap/parser/ast" + "github.com/pingcap/tidb/parser/ast" "github.com/pingcap/dm/dm/pb" "github.com/pingcap/dm/pkg/binlog" diff --git a/syncer/job_test.go b/syncer/job_test.go index 439425e745..83a175b866 100644 --- a/syncer/job_test.go +++ b/syncer/job_test.go @@ -15,8 +15,8 @@ package syncer import ( . "github.com/pingcap/check" - "github.com/pingcap/parser" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser" "github.com/pingcap/tidb/util/mock" "github.com/pingcap/dm/pkg/binlog" diff --git a/syncer/online-ddl-tools/online_ddl.go b/syncer/online-ddl-tools/online_ddl.go index a824ed2848..3f6e2d6673 100644 --- a/syncer/online-ddl-tools/online_ddl.go +++ b/syncer/online-ddl-tools/online_ddl.go @@ -29,10 +29,10 @@ import ( "github.com/pingcap/dm/syncer/dbconn" "github.com/pingcap/failpoint" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/dbutil" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" "go.uber.org/zap" ) diff --git a/syncer/optimist.go b/syncer/optimist.go index 9d21785089..fdeab2bf59 100644 --- a/syncer/optimist.go +++ b/syncer/optimist.go @@ -17,9 +17,9 @@ import ( "context" "github.com/pingcap/failpoint" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" "go.uber.org/zap" "github.com/pingcap/dm/pkg/log" diff --git a/syncer/schema.go b/syncer/schema.go index 85fba54371..113aa1ce65 100644 --- a/syncer/schema.go +++ b/syncer/schema.go @@ -17,10 +17,10 @@ import ( "context" "strings" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/format" - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/format" + "github.com/pingcap/tidb/parser/model" "go.uber.org/zap" "github.com/pingcap/dm/dm/config" diff --git a/syncer/shardddl/optimist.go b/syncer/shardddl/optimist.go index 01cea5788c..8d129198e4 100644 --- a/syncer/shardddl/optimist.go +++ b/syncer/shardddl/optimist.go @@ -17,7 +17,7 @@ import ( "context" "sync" - "github.com/pingcap/parser/model" + "github.com/pingcap/tidb/parser/model" "go.etcd.io/etcd/clientv3" "go.uber.org/zap" diff --git a/syncer/shardddl/optimist_test.go b/syncer/shardddl/optimist_test.go index 8e3c9bc24c..5f4017be0c 100644 --- a/syncer/shardddl/optimist_test.go +++ b/syncer/shardddl/optimist_test.go @@ -18,10 +18,10 @@ import ( "fmt" . "github.com/pingcap/check" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/model" tiddl "github.com/pingcap/tidb/ddl" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" "github.com/pingcap/tidb/sessionctx" "github.com/pingcap/tidb/util/mock" diff --git a/syncer/syncer.go b/syncer/syncer.go index 745ae36a66..a17448de31 100644 --- a/syncer/syncer.go +++ b/syncer/syncer.go @@ -30,16 +30,16 @@ import ( "github.com/go-mysql-org/go-mysql/replication" "github.com/pingcap/errors" "github.com/pingcap/failpoint" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/format" - "github.com/pingcap/parser/model" bf "github.com/pingcap/tidb-tools/pkg/binlog-filter" cm "github.com/pingcap/tidb-tools/pkg/column-mapping" "github.com/pingcap/tidb-tools/pkg/dbutil" "github.com/pingcap/tidb-tools/pkg/filter" router "github.com/pingcap/tidb-tools/pkg/table-router" toolutils "github.com/pingcap/tidb-tools/pkg/utils" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/format" + "github.com/pingcap/tidb/parser/model" "go.etcd.io/etcd/clientv3" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/syncer/syncer_test.go b/syncer/syncer_test.go index 0ded94cab0..a1114ada11 100644 --- a/syncer/syncer_test.go +++ b/syncer/syncer_test.go @@ -48,11 +48,11 @@ import ( "github.com/go-mysql-org/go-mysql/replication" _ "github.com/go-sql-driver/mysql" . "github.com/pingcap/check" - "github.com/pingcap/parser" bf "github.com/pingcap/tidb-tools/pkg/binlog-filter" cm "github.com/pingcap/tidb-tools/pkg/column-mapping" "github.com/pingcap/tidb-tools/pkg/filter" router "github.com/pingcap/tidb-tools/pkg/table-router" + "github.com/pingcap/tidb/parser" "go.uber.org/zap" ) diff --git a/syncer/util.go b/syncer/util.go index 1bc4bcc33c..066dde265c 100644 --- a/syncer/util.go +++ b/syncer/util.go @@ -19,8 +19,8 @@ import ( dcontext "github.com/pingcap/dumpling/v4/context" "github.com/pingcap/dumpling/v4/export" dlog "github.com/pingcap/dumpling/v4/log" - "github.com/pingcap/parser/ast" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser/ast" "go.uber.org/zap" "github.com/pingcap/dm/pkg/conn" diff --git a/syncer/util_test.go b/syncer/util_test.go index ac6a481089..b2f1dc1264 100644 --- a/syncer/util_test.go +++ b/syncer/util_test.go @@ -15,10 +15,10 @@ package syncer import ( . "github.com/pingcap/check" - "github.com/pingcap/parser" - "github.com/pingcap/parser/ast" - "github.com/pingcap/parser/model" "github.com/pingcap/tidb-tools/pkg/filter" + "github.com/pingcap/tidb/parser" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" _ "github.com/pingcap/tidb/types/parser_driver" )