Skip to content

Commit 680f175

Browse files
craig[bot]arulajmani
andcommitted
Merge #148086
148086: concurrency: remove stale comment r=arulajmani a=arulajmani Doesn't line up with the comment on the function and the logic it's commenting. Epic: None Release note: None Co-authored-by: Arul Ajmani <[email protected]>
2 parents 2aff402 + c3d00d7 commit 680f175

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

pkg/kv/kvserver/concurrency/lock_table.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,9 +1495,6 @@ func (tl *txnLock) writeTS() hlc.Timestamp {
14951495
// lock strength == lock.Exclusive. Note that unreplicated locks can't be held
14961496
// with lock strength lock.Intent.
14971497
if tl.isHeldUnreplicated() && tl.unreplicatedInfo.held(lock.Exclusive) {
1498-
// If there's both a write intent and an unreplicated exclusive lock, we want
1499-
// to prefer the lower of the two timestamps, since the lower timestamp
1500-
// blocks more non-locking readers.
15011498
return tl.unreplicatedInfo.ts
15021499
}
15031500
return hlc.MaxTimestamp

0 commit comments

Comments
 (0)