From e009938aeb436f60b84ffae3e6ab37f2163debdd Mon Sep 17 00:00:00 2001 From: disksing Date: Mon, 19 Apr 2021 14:39:52 +0800 Subject: [PATCH] util: move deadlock into mocktikv (#24103) --- {util => store/tikv/mockstore}/deadlock/deadlock.go | 0 {util => store/tikv/mockstore}/deadlock/deadlock_test.go | 0 store/tikv/mockstore/mocktikv/mvcc_leveldb.go | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename {util => store/tikv/mockstore}/deadlock/deadlock.go (100%) rename {util => store/tikv/mockstore}/deadlock/deadlock_test.go (100%) diff --git a/util/deadlock/deadlock.go b/store/tikv/mockstore/deadlock/deadlock.go similarity index 100% rename from util/deadlock/deadlock.go rename to store/tikv/mockstore/deadlock/deadlock.go diff --git a/util/deadlock/deadlock_test.go b/store/tikv/mockstore/deadlock/deadlock_test.go similarity index 100% rename from util/deadlock/deadlock_test.go rename to store/tikv/mockstore/deadlock/deadlock_test.go diff --git a/store/tikv/mockstore/mocktikv/mvcc_leveldb.go b/store/tikv/mockstore/mocktikv/mvcc_leveldb.go index 5b101d1081..a07058ad42 100644 --- a/store/tikv/mockstore/mocktikv/mvcc_leveldb.go +++ b/store/tikv/mockstore/mocktikv/mvcc_leveldb.go @@ -28,9 +28,9 @@ import ( "github.com/pingcap/kvproto/pkg/kvrpcpb" "github.com/pingcap/parser/terror" "github.com/pingcap/tidb/kv" + "github.com/pingcap/tidb/store/tikv/mockstore/deadlock" "github.com/pingcap/tidb/store/tikv/oracle" "github.com/pingcap/tidb/util/codec" - "github.com/pingcap/tidb/util/deadlock" "github.com/pingcap/tidb/util/logutil" "go.uber.org/zap" )