Skip to content

Commit

Permalink
Update basic_lib_for_test.go
Browse files Browse the repository at this point in the history
  • Loading branch information
BornChanger authored Dec 13, 2024
1 parent bd1f4fb commit 46d2085
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions br/pkg/streamhelper/basic_lib_for_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -766,14 +766,11 @@ func (t *testEnv) putTask() {
}

func (t *testEnv) ScanLocksInOneRegion(bo *tikv.Backoffer, key []byte, maxVersion uint64, limit uint32) ([]*txnlock.Lock, *tikv.KeyLocation, error) {
<<<<<<< HEAD
=======
t.mu.Lock()
defer t.mu.Unlock()
if t.maxTs != maxVersion {
return nil, nil, errors.Errorf("unexpect max version in scan lock, expected %d, actual %d", t.maxTs, maxVersion)
}
>>>>>>> 6528da5f400 (test: fix data race in scan locks (#57299))
for _, r := range t.regions {
if len(r.locks) != 0 {
return r.locks, &tikv.KeyLocation{
Expand Down

0 comments on commit 46d2085

Please sign in to comment.