This is an automated cherry-pick of #11112

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
pingcap · May 21, 2024 · e35dac8 · e35dac8
1 parent 288bb64
commit e35dac8
Show file tree

Hide file tree

Showing 7 changed files with 856 additions and 0 deletions.
diff --git a/dm/config/subtask.go b/dm/config/subtask.go
@@ -28,8 +28,11 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
+<<<<<<< HEAD
 	bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
 	"github.com/pingcap/tidb-tools/pkg/column-mapping"
+=======
+>>>>>>> 1c7c9aec24 (dep(dm): move column-mapping from tidb-tools to tiflow repo (#11112))
 	extstorage "github.com/pingcap/tidb/br/pkg/storage"
 	"github.com/pingcap/tidb/pkg/util/dbutil"
 	"github.com/pingcap/tidb/pkg/util/filter"
@@ -41,6 +44,11 @@ import (
 	"github.com/pingcap/tiflow/dm/pkg/terror"
 	"github.com/pingcap/tiflow/dm/pkg/utils"
 	"github.com/pingcap/tiflow/engine/pkg/promutil"
+<<<<<<< HEAD
+=======
+	bf "github.com/pingcap/tiflow/pkg/binlog-filter"
+	"github.com/pingcap/tiflow/pkg/column-mapping"
+>>>>>>> 1c7c9aec24 (dep(dm): move column-mapping from tidb-tools to tiflow repo (#11112))
 	"github.com/pingcap/tiflow/pkg/version"
 	"go.uber.org/atomic"
 	"go.uber.org/zap"

diff --git a/dm/config/task.go b/dm/config/task.go
@@ -28,8 +28,11 @@ import (
 	"github.com/coreos/go-semver/semver"
 	"github.com/docker/go-units"
 	"github.com/dustin/go-humanize"
+<<<<<<< HEAD
 	bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
 	"github.com/pingcap/tidb-tools/pkg/column-mapping"
+=======
+>>>>>>> 1c7c9aec24 (dep(dm): move column-mapping from tidb-tools to tiflow repo (#11112))
 	"github.com/pingcap/tidb/pkg/lightning/config"
 	"github.com/pingcap/tidb/pkg/parser"
 	"github.com/pingcap/tidb/pkg/util/filter"
@@ -38,6 +41,11 @@ import (
 	"github.com/pingcap/tiflow/dm/pkg/log"
 	"github.com/pingcap/tiflow/dm/pkg/terror"
 	"github.com/pingcap/tiflow/dm/pkg/utils"
+<<<<<<< HEAD
+=======
+	bf "github.com/pingcap/tiflow/pkg/binlog-filter"
+	"github.com/pingcap/tiflow/pkg/column-mapping"
+>>>>>>> 1c7c9aec24 (dep(dm): move column-mapping from tidb-tools to tiflow repo (#11112))
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v2"
 )

diff --git a/dm/config/task_converters.go b/dm/config/task_converters.go
@@ -17,8 +17,11 @@ import (
 	"fmt"
 	"strings"
 
+<<<<<<< HEAD
 	bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
 	"github.com/pingcap/tidb-tools/pkg/column-mapping"
+=======
+>>>>>>> 1c7c9aec24 (dep(dm): move column-mapping from tidb-tools to tiflow repo (#11112))
 	"github.com/pingcap/tidb/pkg/util/filter"
 	router "github.com/pingcap/tidb/pkg/util/table-router"
 	"github.com/pingcap/tiflow/dm/config/dbconfig"
@@ -27,6 +30,11 @@ import (
 	"github.com/pingcap/tiflow/dm/pkg/log"
 	"github.com/pingcap/tiflow/dm/pkg/storage"
 	"github.com/pingcap/tiflow/dm/pkg/terror"
+<<<<<<< HEAD
+=======
+	bf "github.com/pingcap/tiflow/pkg/binlog-filter"
+	"github.com/pingcap/tiflow/pkg/column-mapping"
+>>>>>>> 1c7c9aec24 (dep(dm): move column-mapping from tidb-tools to tiflow repo (#11112))
 	"go.uber.org/zap"
 )
 

diff --git a/dm/syncer/syncer_test.go b/dm/syncer/syncer_test.go
@@ -31,8 +31,11 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/failpoint"
+<<<<<<< HEAD
 	bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
 	cm "github.com/pingcap/tidb-tools/pkg/column-mapping"
+=======
+>>>>>>> 1c7c9aec24 (dep(dm): move column-mapping from tidb-tools to tiflow repo (#11112))
 	"github.com/pingcap/tidb/pkg/infoschema"
 	"github.com/pingcap/tidb/pkg/parser"
 	"github.com/pingcap/tidb/pkg/parser/ast"
@@ -58,6 +61,11 @@ import (
 	"github.com/pingcap/tiflow/dm/syncer/binlogstream"
 	"github.com/pingcap/tiflow/dm/syncer/dbconn"
 	"github.com/pingcap/tiflow/dm/syncer/metrics"
+<<<<<<< HEAD
+=======
+	bf "github.com/pingcap/tiflow/pkg/binlog-filter"
+	cm "github.com/pingcap/tiflow/pkg/column-mapping"
+>>>>>>> 1c7c9aec24 (dep(dm): move column-mapping from tidb-tools to tiflow repo (#11112))
 	"github.com/pingcap/tiflow/pkg/errorutil"
 	"github.com/pingcap/tiflow/pkg/sqlmodel"
 	"github.com/stretchr/testify/require"

diff --git a/engine/jobmaster/dm/config/config.go b/engine/jobmaster/dm/config/config.go
@@ -20,14 +20,22 @@ import (
 
 	"github.com/dustin/go-humanize"
 	"github.com/google/uuid"
+<<<<<<< HEAD
 	bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
 	"github.com/pingcap/tidb-tools/pkg/column-mapping"
+=======
+>>>>>>> 1c7c9aec24 (dep(dm): move column-mapping from tidb-tools to tiflow repo (#11112))
 	"github.com/pingcap/tidb/pkg/util/filter"
 	router "github.com/pingcap/tidb/pkg/util/table-router"
 	"github.com/pingcap/tiflow/dm/config"
 	dmconfig "github.com/pingcap/tiflow/dm/config"
 	"github.com/pingcap/tiflow/dm/config/dbconfig"
 	"github.com/pingcap/tiflow/dm/master"
+<<<<<<< HEAD
+=======
+	bf "github.com/pingcap/tiflow/pkg/binlog-filter"
+	"github.com/pingcap/tiflow/pkg/column-mapping"
+>>>>>>> 1c7c9aec24 (dep(dm): move column-mapping from tidb-tools to tiflow repo (#11112))
 	"github.com/pingcap/tiflow/pkg/errors"
 	"go.uber.org/atomic"
 	"gopkg.in/yaml.v2"