Skip to content

Commit

Permalink
feat: Migrate spanz module from tiflow (#966)
Browse files Browse the repository at this point in the history 
close #965
  • Loading branch information
@wlwilliamx
wlwilliamx authored Feb 7, 2025
1 parent 93cc0d6 commit 7437b16
Show file tree
Hide file tree
Showing 35 changed files with 1,381 additions and 23 deletions.
2 changes: 1 addition & 1 deletion cmd/kafka-consumer/writer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/confluentinc/confluent-kafka-go/v2/kafka"
"github.com/pingcap/log"
cerror "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/tiflow/cdc/model"
"github.com/pingcap/tiflow/cdc/sink/ddlsink"
ddlsinkfactory "github.com/pingcap/tiflow/cdc/sink/ddlsink/factory"
Expand All @@ -36,7 +37,6 @@ import (
"github.com/pingcap/tiflow/pkg/sink/codec/canal"
"github.com/pingcap/tiflow/pkg/sink/codec/open"
"github.com/pingcap/tiflow/pkg/sink/codec/simple"
"github.com/pingcap/tiflow/pkg/spanz"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/pulsar-consumer/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/apache/pulsar-client-go/pulsar/auth"
"github.com/pingcap/errors"
"github.com/pingcap/log"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/tiflow/cdc/model"
"github.com/pingcap/tiflow/cdc/sink/ddlsink"
ddlsinkfactory "github.com/pingcap/tiflow/cdc/sink/ddlsink/factory"
Expand All @@ -46,7 +47,6 @@ import (
"github.com/pingcap/tiflow/pkg/sink/codec/canal"
"github.com/pingcap/tiflow/pkg/sink/codec/common"
tpulsar "github.com/pingcap/tiflow/pkg/sink/pulsar"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/pingcap/tiflow/pkg/util"
"github.com/pingcap/tiflow/pkg/version"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion cmd/storage-consumer/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (

"github.com/pingcap/errors"
"github.com/pingcap/log"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/tidb/br/pkg/storage"
"github.com/pingcap/tiflow/cdc/model"
"github.com/pingcap/tiflow/cdc/sink/ddlsink"
Expand All @@ -47,7 +48,6 @@ import (
"github.com/pingcap/tiflow/pkg/sink/codec/canal"
"github.com/pingcap/tiflow/pkg/sink/codec/common"
"github.com/pingcap/tiflow/pkg/sink/codec/csv"
"github.com/pingcap/tiflow/pkg/spanz"
putil "github.com/pingcap/tiflow/pkg/util"
"github.com/pingcap/tiflow/pkg/version"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion downstreamadapter/dispatcher/dispatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/pingcap/ticdc/pkg/common"
commonEvent "github.com/pingcap/ticdc/pkg/common/event"
"github.com/pingcap/ticdc/pkg/sink/util"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/pingcap/ticdc/pkg/spanz"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion downstreamadapter/dispatcher/dispatcher_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
commonEvent "github.com/pingcap/ticdc/pkg/common/event"
"github.com/pingcap/ticdc/pkg/node"
sinkutil "github.com/pingcap/ticdc/pkg/sink/util"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion heartbeatpb/table_span.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package heartbeatpb
import (
"bytes"

"github.com/pingcap/tiflow/pkg/spanz"
"github.com/pingcap/ticdc/pkg/spanz"
)

// DDLSpanSchemaID is the special schema id for DDL
Expand Down
2 changes: 1 addition & 1 deletion logservice/coordinator/coordinator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
appcontext "github.com/pingcap/ticdc/pkg/common/context"
"github.com/pingcap/ticdc/pkg/messaging"
"github.com/pingcap/ticdc/pkg/node"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/ticdc/server/watcher"
"github.com/pingcap/tiflow/pkg/chann"
"github.com/pingcap/tiflow/pkg/spanz"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion logservice/coordinator/coordinator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/pingcap/ticdc/heartbeatpb"
"github.com/pingcap/ticdc/logservice/logservicepb"
"github.com/pingcap/ticdc/pkg/node"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion logservice/logpuller/region_event_handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"github.com/pingcap/ticdc/heartbeatpb"
"github.com/pingcap/ticdc/logservice/logpuller/regionlock"
"github.com/pingcap/ticdc/pkg/common"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/ticdc/utils/dynstream"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/stretchr/testify/require"
"github.com/tikv/client-go/v2/tikv"
)
Expand Down
2 changes: 1 addition & 1 deletion logservice/logpuller/regionlock/region_range_lock_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/pingcap/ticdc/heartbeatpb"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion logservice/logpuller/subscription_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
cerror "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/ticdc/pkg/metrics"
"github.com/pingcap/ticdc/pkg/pdutil"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/ticdc/pkg/util"
"github.com/pingcap/ticdc/utils/dynstream"
"github.com/pingcap/tiflow/pkg/security"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/prometheus/client_golang/prometheus"
kvclientv2 "github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/oracle"
Expand Down
2 changes: 1 addition & 1 deletion maintainer/maintainer_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ import (
"github.com/pingcap/ticdc/pkg/node"
"github.com/pingcap/ticdc/pkg/pdutil"
"github.com/pingcap/ticdc/pkg/scheduler"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/ticdc/server/watcher"
"github.com/pingcap/ticdc/utils"
"github.com/pingcap/ticdc/utils/threadpool"
"github.com/pingcap/tiflow/pkg/spanz"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion maintainer/maintainer_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ import (
"github.com/pingcap/ticdc/pkg/pdutil"
"github.com/pingcap/ticdc/pkg/scheduler"
pkgOpearator "github.com/pingcap/ticdc/pkg/scheduler/operator"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/ticdc/server/watcher"
"github.com/pingcap/ticdc/utils/threadpool"
"github.com/pingcap/tiflow/cdc/processor/tablepb"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion maintainer/maintainer_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ import (
"github.com/pingcap/ticdc/pkg/messaging/proto"
"github.com/pingcap/ticdc/pkg/node"
"github.com/pingcap/ticdc/pkg/pdutil"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/ticdc/server/watcher"
"github.com/pingcap/tiflow/cdc/model"
config2 "github.com/pingcap/tiflow/pkg/config"
"github.com/pingcap/tiflow/pkg/orchestrator"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion maintainer/range_checker/table_span_range_checker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"sync/atomic"

"github.com/google/btree"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/pingcap/ticdc/pkg/spanz"
)

// TableSpanRangeChecker is used to check if all ranges cover the start and end byte slices.
Expand Down
2 changes: 1 addition & 1 deletion maintainer/range_checker/table_span_range_checker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"bytes"
"testing"

"github.com/pingcap/tiflow/pkg/spanz"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion maintainer/replica/replication_db_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/pingcap/ticdc/heartbeatpb"
replica_mock "github.com/pingcap/ticdc/maintainer/replica/mock"
"github.com/pingcap/ticdc/pkg/common"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion maintainer/replica/replication_span.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/pingcap/ticdc/pkg/node"
"github.com/pingcap/ticdc/pkg/retry"
"github.com/pingcap/ticdc/pkg/scheduler/replica"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/tiflow/cdc/processor/tablepb"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/atomic"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion maintainer/scheduler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"github.com/pingcap/ticdc/pkg/common"
"github.com/pingcap/ticdc/pkg/scheduler"
pkgReplica "github.com/pingcap/ticdc/pkg/scheduler/replica"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/ticdc/server/watcher"
"github.com/pingcap/ticdc/utils"
"github.com/pingcap/tiflow/pkg/spanz"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion maintainer/split/region_count_splitter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

"github.com/pingcap/ticdc/heartbeatpb"
"github.com/pingcap/ticdc/pkg/common"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/tiflow/cdc/processor/tablepb"
"github.com/pingcap/tiflow/pkg/config"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/stretchr/testify/require"
"github.com/tikv/client-go/v2/tikv"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/common/event/mounter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (

"github.com/pingcap/errors"
"github.com/pingcap/ticdc/pkg/common"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/tidb/pkg/meta/model"
"github.com/pingcap/tidb/pkg/tablecodec"
"github.com/pingcap/tidb/pkg/types"
"github.com/pingcap/tidb/pkg/util/chunk"
"github.com/pingcap/tidb/pkg/util/rowcodec"
"github.com/pingcap/tiflow/pkg/spanz"
)

// DDLTableInfo contains the tableInfo about tidb_ddl_job and tidb_ddl_history
Expand Down
2 changes: 1 addition & 1 deletion pkg/pdutil/api_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/log"
"github.com/pingcap/ticdc/pkg/retry"
"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/tiflow/cdc/processor/tablepb"
cerror "github.com/pingcap/tiflow/pkg/errors"
"github.com/pingcap/tiflow/pkg/httputil"
"github.com/pingcap/tiflow/pkg/security"
"github.com/pingcap/tiflow/pkg/spanz"
pd "github.com/tikv/pd/client"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/pdutil/api_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"strconv"
"testing"

"github.com/pingcap/ticdc/pkg/spanz"
"github.com/pingcap/tidb/pkg/tablecodec"
"github.com/pingcap/tidb/pkg/util/codec"
"github.com/pingcap/tiflow/cdc/processor/tablepb"
cerror "github.com/pingcap/tiflow/pkg/errors"
"github.com/pingcap/tiflow/pkg/httputil"
"github.com/pingcap/tiflow/pkg/spanz"
"github.com/stretchr/testify/require"
pd "github.com/tikv/pd/client"
)
Expand Down
Loading

0 comments on commit 7437b16

Please sign in to comment.