Skip to content

Commit

Permalink
*: update tidb (#2109)
Browse files Browse the repository at this point in the history
  • Loading branch information
@disksing
disksing authored Jun 22, 2021
1 parent 79abe74 commit dc6de98
Show file tree
Hide file tree
Showing 41 changed files with 101 additions and 90 deletions.
2 changes: 1 addition & 1 deletion cdc/entry/mounter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
tidbkv "github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/session"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/pingcap/tidb/util/testkit"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cdc/entry/schema_storage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import (
"github.com/pingcap/tidb/session"
"github.com/pingcap/tidb/sessionctx"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/testkit"
"github.com/tikv/client-go/v2/oracle"
)

type schemaSuite struct{}
Expand Down
2 changes: 1 addition & 1 deletion cdc/entry/schema_test_helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
timeta "github.com/pingcap/tidb/meta"
"github.com/pingcap/tidb/session"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/pingcap/tidb/util/testkit"
"github.com/tikv/client-go/v2/oracle"
)

// SchemaTestHelper is a test helper for schema which creates an internal tidb instance to generate DDL jobs with meta information
Expand Down
2 changes: 1 addition & 1 deletion cdc/http_api_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pingcap/ticdc/cdc/model"
cerror "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/ticdc/pkg/httputil"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cdc/http_handler.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/config"
cerror "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/ticdc/pkg/logutil"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
"go.etcd.io/etcd/clientv3/concurrency"
"go.uber.org/zap"
)
Expand Down
8 changes: 4 additions & 4 deletions cdc/kv/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import (
"github.com/pingcap/ticdc/pkg/txnutil"
"github.com/pingcap/ticdc/pkg/util"
"github.com/pingcap/ticdc/pkg/version"
"github.com/pingcap/tidb/store/tikv"
tidbkv "github.com/pingcap/tidb/store/tikv/kv"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/prometheus/client_golang/prometheus"
tidbkv "github.com/tikv/client-go/v2/kv"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/tikv"
pd "github.com/tikv/pd/client"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
Expand Down Expand Up @@ -1167,7 +1167,7 @@ func (s *eventFeedSession) handleError(ctx context.Context, errInfo regionErrorI
if notLeader := innerErr.GetNotLeader(); notLeader != nil {
metricFeedNotLeaderCounter.Inc()
// TODO: Handle the case that notleader.GetLeader() is nil.
s.regionCache.UpdateLeader(errInfo.verID, notLeader.GetLeader().GetStoreId(), errInfo.rpcCtx.AccessIdx)
s.regionCache.UpdateLeader(errInfo.verID, notLeader.GetLeader(), errInfo.rpcCtx.AccessIdx)
} else if innerErr.GetEpochNotMatch() != nil {
// TODO: If only confver is updated, we don't need to reload the region from region cache.
metricFeedEpochNotMatchCounter.Inc()
Expand Down
6 changes: 3 additions & 3 deletions cdc/kv/client_bench_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"github.com/pingcap/ticdc/pkg/security"
"github.com/pingcap/ticdc/pkg/txnutil"
"github.com/pingcap/tidb/store/mockstore/mockcopr"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/tikv/mockstore/mocktikv"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/mockstore/mocktikv"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/tikv"
"go.uber.org/zap/zapcore"
"google.golang.org/grpc"
)
Expand Down
6 changes: 3 additions & 3 deletions cdc/kv/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ import (
"github.com/pingcap/ticdc/pkg/util/testleak"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/store/mockstore/mockcopr"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/tikv/mockstore/mocktikv"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/mockstore/mocktikv"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/tikv"
"go.uber.org/zap"
"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion cdc/kv/region_worker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"github.com/pingcap/ticdc/pkg/regionspan"
"github.com/pingcap/ticdc/pkg/util"
"github.com/pingcap/ticdc/pkg/workerpool"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/prometheus/client_golang/prometheus"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
"golang.org/x/time/rate"
Expand Down
4 changes: 2 additions & 2 deletions cdc/kv/store_op.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"github.com/pingcap/tidb/meta"
"github.com/pingcap/tidb/store"
"github.com/pingcap/tidb/store/driver"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/tikv"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cdc/kv/testing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/store"
"github.com/pingcap/tidb/store/driver"
"github.com/pingcap/tidb/store/tikv"
"github.com/stretchr/testify/require"
"github.com/tikv/client-go/v2/tikv"
pd "github.com/tikv/pd/client"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion cdc/kv/token_region_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/pingcap/check"
"github.com/pingcap/errors"
"github.com/pingcap/ticdc/pkg/util/testleak"
"github.com/pingcap/tidb/store/tikv"
"github.com/tikv/client-go/v2/tikv"
"golang.org/x/sync/errgroup"
)

Expand Down
4 changes: 2 additions & 2 deletions cdc/model/changefeed.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/pingcap/ticdc/pkg/config"
"github.com/pingcap/ticdc/pkg/cyclic/mark"
cerror "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -131,7 +131,7 @@ func (info *ChangeFeedInfo) GetStartTs() uint64 {
return info.StartTs
}

return oracle.EncodeTSO(info.CreateTime.Unix() * 1000)
return oracle.GoTimeToTS(info.CreateTime)
}

// GetCheckpointTs returns CheckpointTs if it's specified in ChangeFeedStatus, otherwise StartTs is returned.
Expand Down
4 changes: 2 additions & 2 deletions cdc/model/changefeed_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
cerror "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/ticdc/pkg/util/testleak"
filter "github.com/pingcap/tidb-tools/pkg/table-filter"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
)

type configSuite struct{}
Expand Down Expand Up @@ -345,7 +345,7 @@ func (s *changefeedSuite) TestGetTs(c *check.C) {
CreateTime: createTime,
}
)
c.Assert(info.GetStartTs(), check.Equals, oracle.EncodeTSO(createTime.Unix()*1000))
c.Assert(info.GetStartTs(), check.Equals, oracle.GoTimeToTS(createTime))
info.StartTs = startTs
c.Assert(info.GetStartTs(), check.Equals, startTs)

Expand Down
2 changes: 1 addition & 1 deletion cdc/owner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"github.com/pingcap/ticdc/pkg/scheduler"
"github.com/pingcap/ticdc/pkg/security"
"github.com/pingcap/ticdc/pkg/util"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
pd "github.com/tikv/pd/client"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/concurrency"
Expand Down
2 changes: 1 addition & 1 deletion cdc/owner/changefeed.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
cerror "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/ticdc/pkg/util"
"github.com/pingcap/tidb/sessionctx/binloginfo"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/prometheus/client_golang/prometheus"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cdc/owner/changefeed_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
cdcContext "github.com/pingcap/ticdc/pkg/context"
"github.com/pingcap/ticdc/pkg/orchestrator"
"github.com/pingcap/ticdc/pkg/util/testleak"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
)

type mockDDLPuller struct {
Expand Down
2 changes: 1 addition & 1 deletion cdc/owner/gc_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pingcap/ticdc/pkg/config"
cdcContext "github.com/pingcap/ticdc/pkg/context"
cerror "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cdc/owner/gc_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
cerror "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/ticdc/pkg/orchestrator"
"github.com/pingcap/ticdc/pkg/util/testleak"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
pd "github.com/tikv/pd/client"
)

Expand Down
2 changes: 1 addition & 1 deletion cdc/owner/owner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/pingcap/ticdc/pkg/etcd"
"github.com/pingcap/ticdc/pkg/orchestrator"
"github.com/pingcap/ticdc/pkg/util/testleak"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
)

var _ = check.Suite(&ownerSuite{})
Expand Down
2 changes: 1 addition & 1 deletion cdc/owner/schema_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/pingcap/ticdc/cdc/model"
"github.com/pingcap/ticdc/pkg/config"
"github.com/pingcap/ticdc/pkg/util/testleak"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
)

var _ = check.Suite(&schemaSuite{})
Expand Down
4 changes: 2 additions & 2 deletions cdc/owner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
"github.com/pingcap/ticdc/pkg/util/testleak"
"github.com/pingcap/tidb/meta"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
pd "github.com/tikv/pd/client"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/concurrency"
Expand Down Expand Up @@ -369,7 +369,7 @@ func (s *ownerSuite) TestOwnerHandleStaleChangeFeed(c *check.C) {
info: &model.ChangeFeedInfo{State: model.StateNormal},
etcdCli: s.client,
status: &model.ChangeFeedStatus{
CheckpointTs: oracle.EncodeTSO(oracle.GetPhysical(time.Now())),
CheckpointTs: oracle.GoTimeToTS(time.Now()),
},
targetTs: 2000,
ddlState: model.ChangeFeedSyncDML,
Expand Down
2 changes: 1 addition & 1 deletion cdc/processor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
"github.com/pingcap/ticdc/pkg/security"
"github.com/pingcap/ticdc/pkg/util"
tidbkv "github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
pd "github.com/tikv/pd/client"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/concurrency"
Expand Down
2 changes: 1 addition & 1 deletion cdc/processor/pipeline/puller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pingcap/ticdc/pkg/pipeline"
"github.com/pingcap/ticdc/pkg/regionspan"
"github.com/pingcap/ticdc/pkg/util"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
"golang.org/x/sync/errgroup"
)

Expand Down
2 changes: 1 addition & 1 deletion cdc/processor/processor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (
"github.com/pingcap/ticdc/pkg/regionspan"
"github.com/pingcap/ticdc/pkg/retry"
"github.com/pingcap/ticdc/pkg/util"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/prometheus/client_golang/prometheus"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cdc/puller/mock_puller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
tidbkv "github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/session"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/store/tikv/mockstore/mocktikv"
"github.com/pingcap/tidb/util/testkit"
"github.com/tikv/client-go/v2/mockstore/mocktikv"
"go.uber.org/zap"
)

Expand Down
8 changes: 4 additions & 4 deletions cdc/puller/mock_puller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/pingcap/ticdc/cdc/entry"
"github.com/pingcap/ticdc/cdc/model"
"github.com/pingcap/ticdc/pkg/util"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
)
type mockPullerSuite struct{}
Expand Down Expand Up @@ -54,7 +54,7 @@ func (s *mockPullerSuite) TestTxnSort(c *check.C) {
pm.MustExec("insert into test.test(id, a) values(?, ?)", 2, 2)
pm.MustExec("insert into test.test(id, a) values(?, ?)", 3, 3)
pm.MustExec("delete from test.test")
waitForGrowingTs(&ts, oracle.EncodeTSO(time.Now().Unix()*1000))
waitForGrowingTs(&ts, oracle.GoTimeToTS(time.Now()))
}
func (s *mockPullerSuite) TestDDLPuller(c *check.C) {
Expand Down Expand Up @@ -93,7 +93,7 @@ func (s *mockPullerSuite) TestDDLPuller(c *check.C) {
pm.MustExec("insert into test.test(id, a) values(?, ?)", 2, 2)
pm.MustExec("insert into test.test(id, a) values(?, ?)", 3, 3)
pm.MustExec("delete from test.test")
waitForGrowingTs(&ts, oracle.EncodeTSO(time.Now().Unix()*1000))
waitForGrowingTs(&ts, oracle.GoTimeToTS(time.Now()))
}
func (s *mockPullerSuite) TestStartTs(c *check.C) {
Expand Down Expand Up @@ -122,7 +122,7 @@ func (s *mockPullerSuite) TestStartTs(c *check.C) {
pm.MustExec("insert into test.test(id, a) values(?, ?)", 2, 2)
pm.MustExec("insert into test.test(id, a) values(?, ?)", 3, 3)
pm.MustExec("delete from test.test")
waitForGrowingTs(&ts, oracle.EncodeTSO(time.Now().Unix()*1000))
waitForGrowingTs(&ts, oracle.GoTimeToTS(time.Now()))
cancel()
mu.Lock()
index := len(rawTxns) / 2
Expand Down
4 changes: 2 additions & 2 deletions cdc/puller/puller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/pingcap/ticdc/pkg/txnutil"
"github.com/pingcap/ticdc/pkg/util"
tidbkv "github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/tikv"
pd "github.com/tikv/pd/client"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
Expand Down
2 changes: 1 addition & 1 deletion cdc/puller/puller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/pingcap/ticdc/pkg/util/testleak"
tidbkv "github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/store/tikv"
"github.com/tikv/client-go/v2/tikv"
pd "github.com/tikv/pd/client"
)

Expand Down
2 changes: 1 addition & 1 deletion cdc/puller/sorter/merger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
cerrors "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/ticdc/pkg/notify"
"github.com/pingcap/ticdc/pkg/util"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
)
Expand Down
2 changes: 1 addition & 1 deletion cdc/sink/codec/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/pingcap/log"
"github.com/pingcap/ticdc/cdc/model"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/client_changefeed.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/security"
"github.com/pingcap/ticdc/pkg/util"
"github.com/pingcap/ticdc/pkg/version"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/r3labs/diff"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/tikv/client-go/v2/oracle"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/client_tso.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package cmd
import (
"os"

"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/spf13/cobra"
"github.com/tikv/client-go/v2/oracle"
)

func newTsoCommand() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/pingcap/parser/model"
"github.com/pingcap/ticdc/pkg/config"
"github.com/pingcap/ticdc/pkg/util/testleak"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/spf13/cobra"
"github.com/tikv/client-go/v2/oracle"
pd "github.com/tikv/pd/client"
)

Expand Down
Loading

0 comments on commit dc6de98

Please sign in to comment.