Skip to content

Commit

Permalink
*: move binlog-filter package to tiflow (#11094)
Browse files Browse the repository at this point in the history 
ref #5035
  • Loading branch information
@lance6716
lance6716 authored May 15, 2024
1 parent 34aeab3 commit c1ee219
Show file tree
Hide file tree
Showing 27 changed files with 919 additions and 24 deletions.
2 changes: 1 addition & 1 deletion cdc/api/v2/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"time"

"github.com/pingcap/errors"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tiflow/cdc/model"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"github.com/pingcap/tiflow/pkg/config"
cerror "github.com/pingcap/tiflow/pkg/errors"
"github.com/pingcap/tiflow/pkg/integrity"
Expand Down
2 changes: 1 addition & 1 deletion cdc/api/v2/model_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"testing"
"time"

bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tiflow/cdc/model"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"github.com/pingcap/tiflow/pkg/config"
"github.com/pingcap/tiflow/pkg/redo"
"github.com/pingcap/tiflow/pkg/util"
Expand Down
2 changes: 1 addition & 1 deletion cmd/dm-syncer/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
"github.com/BurntSushi/toml"
"github.com/go-mysql-org/go-mysql/mysql"
"github.com/pingcap/errors"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tidb/pkg/util/filter"
router "github.com/pingcap/tidb/pkg/util/table-router"
"github.com/pingcap/tiflow/dm/config"
"github.com/pingcap/tiflow/dm/config/dbconfig"
"github.com/pingcap/tiflow/dm/pkg/log"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"github.com/pingcap/tiflow/pkg/version"
)

Expand Down
2 changes: 1 addition & 1 deletion dm/config/source_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ import (

"github.com/BurntSushi/toml"
"github.com/go-mysql-org/go-mysql/mysql"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tiflow/dm/config/dbconfig"
"github.com/pingcap/tiflow/dm/pkg/conn"
tcontext "github.com/pingcap/tiflow/dm/pkg/context"
"github.com/pingcap/tiflow/dm/pkg/gtid"
"github.com/pingcap/tiflow/dm/pkg/log"
"github.com/pingcap/tiflow/dm/pkg/terror"
"github.com/pingcap/tiflow/dm/pkg/utils"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"go.uber.org/zap"
"gopkg.in/yaml.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion dm/config/source_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/go-mysql-org/go-mysql/mysql"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tiflow/dm/config/dbconfig"
"github.com/pingcap/tiflow/dm/pkg/conn"
tcontext "github.com/pingcap/tiflow/dm/pkg/context"
"github.com/pingcap/tiflow/dm/pkg/encrypt"
"github.com/pingcap/tiflow/dm/pkg/utils"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion dm/config/subtask.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"time"

"github.com/BurntSushi/toml"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tidb-tools/pkg/column-mapping"
extstorage "github.com/pingcap/tidb/br/pkg/storage"
"github.com/pingcap/tidb/pkg/util/dbutil"
Expand All @@ -41,6 +40,7 @@ import (
"github.com/pingcap/tiflow/dm/pkg/terror"
"github.com/pingcap/tiflow/dm/pkg/utils"
"github.com/pingcap/tiflow/engine/pkg/promutil"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"github.com/pingcap/tiflow/pkg/version"
"go.uber.org/atomic"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion dm/config/task.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"github.com/coreos/go-semver/semver"
"github.com/docker/go-units"
"github.com/dustin/go-humanize"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tidb-tools/pkg/column-mapping"
"github.com/pingcap/tidb/pkg/lightning/config"
"github.com/pingcap/tidb/pkg/parser"
Expand All @@ -38,6 +37,7 @@ import (
"github.com/pingcap/tiflow/dm/pkg/log"
"github.com/pingcap/tiflow/dm/pkg/terror"
"github.com/pingcap/tiflow/dm/pkg/utils"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"go.uber.org/zap"
"gopkg.in/yaml.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion dm/config/task_converters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"fmt"
"strings"

bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tidb-tools/pkg/column-mapping"
"github.com/pingcap/tidb/pkg/util/filter"
router "github.com/pingcap/tidb/pkg/util/table-router"
Expand All @@ -27,6 +26,7 @@ import (
"github.com/pingcap/tiflow/dm/pkg/log"
"github.com/pingcap/tiflow/dm/pkg/storage"
"github.com/pingcap/tiflow/dm/pkg/terror"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion dm/config/task_converters_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
"testing"

"github.com/pingcap/check"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tidb/pkg/util/filter"
"github.com/pingcap/tiflow/dm/config/dbconfig"
"github.com/pingcap/tiflow/dm/openapi"
"github.com/pingcap/tiflow/dm/openapi/fixtures"
"github.com/pingcap/tiflow/dm/pkg/terror"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion dm/config/task_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import (
"testing"

"github.com/coreos/go-semver/semver"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tidb/pkg/util/filter"
router "github.com/pingcap/tidb/pkg/util/table-router"
"github.com/pingcap/tiflow/dm/config/dbconfig"
"github.com/pingcap/tiflow/dm/config/security"
"github.com/pingcap/tiflow/dm/pkg/encrypt"
"github.com/pingcap/tiflow/dm/pkg/terror"
"github.com/pingcap/tiflow/dm/pkg/utils"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion dm/master/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (

"github.com/golang/mock/gomock"
. "github.com/pingcap/check"
filter "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tiflow/dm/config"
"github.com/pingcap/tiflow/dm/master/workerrpc"
"github.com/pingcap/tiflow/dm/pb"
Expand All @@ -33,6 +32,7 @@ import (
"github.com/pingcap/tiflow/dm/pkg/ha"
"github.com/pingcap/tiflow/dm/pkg/log"
"github.com/pingcap/tiflow/dm/pkg/terror"
filter "github.com/pingcap/tiflow/pkg/binlog-filter"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/tests/v3/integration"
)
Expand Down
2 changes: 1 addition & 1 deletion dm/syncer/ddl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (

"github.com/go-mysql-org/go-mysql/replication"
"github.com/pingcap/failpoint"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
tidbddl "github.com/pingcap/tidb/pkg/ddl"
"github.com/pingcap/tidb/pkg/parser"
"github.com/pingcap/tidb/pkg/parser/ast"
Expand All @@ -47,6 +46,7 @@ import (
onlineddl "github.com/pingcap/tiflow/dm/syncer/online-ddl-tools"
sm "github.com/pingcap/tiflow/dm/syncer/safe-mode"
"github.com/pingcap/tiflow/dm/syncer/shardddl"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"go.uber.org/atomic"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion dm/syncer/filter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ package syncer

import (
"github.com/go-mysql-org/go-mysql/replication"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tidb/pkg/util/filter"
"github.com/pingcap/tiflow/dm/pkg/terror"
"github.com/pingcap/tiflow/dm/pkg/utils"
onlineddl "github.com/pingcap/tiflow/dm/syncer/online-ddl-tools"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion dm/syncer/filter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"github.com/go-mysql-org/go-mysql/mysql"
"github.com/go-mysql-org/go-mysql/replication"
. "github.com/pingcap/check"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tidb/pkg/parser"
"github.com/pingcap/tidb/pkg/util/filter"
"github.com/pingcap/tiflow/dm/config"
Expand All @@ -32,6 +31,7 @@ import (
"github.com/pingcap/tiflow/dm/pkg/schema"
"github.com/pingcap/tiflow/dm/pkg/utils"
"github.com/pingcap/tiflow/dm/syncer/dbconn"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
)

type testFilterSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion dm/syncer/syncer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
mysql2 "github.com/go-sql-driver/mysql"
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
tidbddl "github.com/pingcap/tidb/pkg/ddl"
"github.com/pingcap/tidb/pkg/parser"
"github.com/pingcap/tidb/pkg/parser/ast"
Expand Down Expand Up @@ -69,6 +68,7 @@ import (
sm "github.com/pingcap/tiflow/dm/syncer/safe-mode"
"github.com/pingcap/tiflow/dm/syncer/shardddl"
"github.com/pingcap/tiflow/dm/unit"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"github.com/pingcap/tiflow/pkg/errorutil"
"github.com/pingcap/tiflow/pkg/sqlmodel"
clientv3 "go.etcd.io/etcd/client/v3"
Expand Down
2 changes: 1 addition & 1 deletion dm/syncer/syncer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
_ "github.com/go-sql-driver/mysql"
. "github.com/pingcap/check"
"github.com/pingcap/failpoint"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
cm "github.com/pingcap/tidb-tools/pkg/column-mapping"
"github.com/pingcap/tidb/pkg/infoschema"
"github.com/pingcap/tidb/pkg/parser"
Expand All @@ -58,6 +57,7 @@ import (
"github.com/pingcap/tiflow/dm/syncer/binlogstream"
"github.com/pingcap/tiflow/dm/syncer/dbconn"
"github.com/pingcap/tiflow/dm/syncer/metrics"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"github.com/pingcap/tiflow/pkg/errorutil"
"github.com/pingcap/tiflow/pkg/sqlmodel"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion dm/worker/source_worker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/golang/protobuf/proto"
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tiflow/dm/config"
"github.com/pingcap/tiflow/dm/pb"
"github.com/pingcap/tiflow/dm/pkg/binlog"
Expand All @@ -35,6 +34,7 @@ import (
"github.com/pingcap/tiflow/dm/pkg/streamer"
"github.com/pingcap/tiflow/dm/pkg/terror"
"github.com/pingcap/tiflow/dm/relay"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
clientv3 "go.etcd.io/etcd/client/v3"
"go.uber.org/atomic"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion engine/jobmaster/dm/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import (

"github.com/dustin/go-humanize"
"github.com/google/uuid"
bf "github.com/pingcap/tidb-tools/pkg/binlog-filter"
"github.com/pingcap/tidb-tools/pkg/column-mapping"
"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"
bf "github.com/pingcap/tiflow/pkg/binlog-filter"
"github.com/pingcap/tiflow/pkg/errors"
"go.uber.org/atomic"
"gopkg.in/yaml.v2"
Expand Down
Loading

0 comments on commit c1ee219

Please sign in to comment.