store/tikv: cleanup warnings and unused code (#22648)

Signed-off-by: disksing <i@disksing.com>
pingcap · Feb 2, 2021 · 7fbe3e5 · 7fbe3e5
1 parent 4e4968c
commit 7fbe3e5
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 50 deletions.
diff --git a/store/tikv/2pc.go b/store/tikv/2pc.go
@@ -90,9 +90,6 @@ type twoPhaseCommitter struct {
 	txnSize             int
 	hasNoNeedCommitKeys bool
 
-	prewriteOnlyKeys int
-	ignoredKeys      int
-
 	primaryKey  []byte
 	forUpdateTS uint64
 

diff --git a/store/tikv/backoff.go b/store/tikv/backoff.go
@@ -238,7 +238,6 @@ const (
 	rawkvMaxBackoff                = 20000
 	splitRegionBackoff             = 20000
 	maxSplitRegionsBackoff         = 120000
-	scatterRegionBackoff           = 20000
 	waitScatterRegionFinishBackoff = 120000
 	locateRegionMaxBackoff         = 20000
 	pessimisticLockMaxBackoff      = 20000

diff --git a/store/tikv/batch_coprocessor.go b/store/tikv/batch_coprocessor.go
@@ -212,8 +212,6 @@ type batchCopIterator struct {
 
 	memTracker *memory.Tracker
 
-	replicaReadSeed uint32
-
 	rpcCancel *RPCCanceller
 
 	wg sync.WaitGroup

diff --git a/store/tikv/coprocessor.go b/store/tikv/coprocessor.go
@@ -291,10 +291,7 @@ type copResponse struct {
 	respTime time.Duration
 }
 
-const (
-	sizeofExecDetails   = int(unsafe.Sizeof(execdetails.ExecDetails{}))
-	sizeofCommitDetails = int(unsafe.Sizeof(execdetails.CommitDetails{}))
-)
+const sizeofExecDetails = int(unsafe.Sizeof(execdetails.ExecDetails{}))
 
 // GetData implements the kv.ResultSubset GetData interface.
 func (rs *copResponse) GetData() []byte {
@@ -815,7 +812,6 @@ func (ch *clientHelper) SendReqCtx(bo *Backoffer, req *tikvrpc.Request, regionID
 const (
 	minLogBackoffTime   = 100
 	minLogKVProcessTime = 100
-	minLogKVWaitTime    = 200
 )
 
 func (worker *copIteratorWorker) logTimeCopTask(costTime time.Duration, task *copTask, bo *Backoffer, resp *tikvrpc.Response) {

diff --git a/store/tikv/coprocessor_test.go b/store/tikv/coprocessor_test.go
@@ -263,20 +263,6 @@ func (s *testCoprocessorSuite) rangeEqual(c *C, ranges []kv.KeyRange, keys ...st
 	}
 }
 
-func (s *testCoprocessorSuite) checkEqual(c *C, copRanges *KeyRanges, ranges []kv.KeyRange, slice bool) {
-	c.Assert(copRanges.Len(), Equals, len(ranges))
-	for i := range ranges {
-		c.Assert(copRanges.At(i), DeepEquals, ranges[i])
-	}
-	if slice {
-		for i := 0; i <= copRanges.Len(); i++ {
-			for j := i; j <= copRanges.Len(); j++ {
-				s.checkEqual(c, copRanges.Slice(i, j), ranges[i:j], false)
-			}
-		}
-	}
-}
-
 func (s *testCoprocessorSuite) TestRateLimit(c *C) {
 	done := make(chan struct{}, 1)
 	rl := newRateLimit(1)

diff --git a/store/tikv/gcworker/gc_worker_test.go b/store/tikv/gcworker/gc_worker_test.go
@@ -1201,9 +1201,7 @@ func (s *testGCWorkerSuite) TestMergeLockScanner(c *C) {
 
 	makeLockList := func(locks ...*tikv.Lock) []*tikv.Lock {
 		res := make([]*tikv.Lock, 0, len(locks))
-		for _, lock := range locks {
-			res = append(res, lock)
-		}
+		res = append(res, locks...)
 		return res
 	}
 

diff --git a/store/tikv/region_cache.go b/store/tikv/region_cache.go
@@ -182,10 +182,7 @@ func (r *RegionStore) kvPeer(seed uint32, op *storeSelectorOp) AccessIndex {
 func (r *RegionStore) filterStoreCandidate(aidx AccessIndex, op *storeSelectorOp) bool {
 	_, s := r.accessStore(TiKvOnly, aidx)
 	// filter label unmatched store
-	if !s.IsLabelsMatch(op.labels) {
-		return false
-	}
-	return true
+	return s.IsLabelsMatch(op.labels)
 }
 
 // init initializes region after constructed.
@@ -1670,7 +1667,6 @@ const (
 	unknown livenessState = iota
 	reachable
 	unreachable
-	offline
 )
 
 func (s *Store) requestLiveness(bo *Backoffer) (l livenessState) {

diff --git a/store/tikv/txn.go b/store/tikv/txn.go
@@ -70,15 +70,7 @@ type tikvTxn struct {
 	committer *twoPhaseCommitter
 	lockedCnt int
 
-	// For data consistency check.
-	// assertions[:confirmed] is the assertion of current transaction.
-	// assertions[confirmed:len(assertions)] is the assertions of current statement.
-	// StmtCommit/StmtRollback may change the confirmed position.
-	assertions []assertionPair
-	confirmed  int
-
 	valid bool
-	dirty bool
 
 	// txnInfoSchema is the infoSchema fetched at startTS.
 	txnInfoSchema SchemaVer
@@ -123,15 +115,6 @@ func newTiKVTxnWithExactStaleness(store *KVStore, txnScope string, prevSec uint6
 	return newTiKVTxnWithStartTS(store, txnScope, startTS, store.nextReplicaReadSeed())
 }
 
-type assertionPair struct {
-	key       kv.Key
-	assertion kv.AssertionType
-}
-
-func (a assertionPair) String() string {
-	return fmt.Sprintf("key: %s, assertion type: %d", a.key, a.assertion)
-}
-
 // SetSuccess is used to probe if kv variables are set or not. It is ONLY used in test cases.
 var SetSuccess = false