storage/spanlatch: address minor PR comments

#31997 (review) Release note: None
cockroachdb · Dec 8, 2018 · f725fe4 · f725fe4
1 parent 24c4c04
commit f725fe4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/storage/spanlatch/manager.go b/pkg/storage/spanlatch/manager.go
@@ -259,7 +259,7 @@ func (m *Manager) insertLocked(lg *Guard) {
 			latches := lg.latches(s, a)
 			for i := range latches {
 				latch := &latches[i]
-				latch.id = m.nextID()
+				latch.id = m.nextIDLocked()
 				switch a {
 				case spanset.SpanReadOnly:
 					// Add reads to the readSet. They only need to enter
@@ -277,7 +277,7 @@ func (m *Manager) insertLocked(lg *Guard) {
 	}
 }
 
-func (m *Manager) nextID() uint64 {
+func (m *Manager) nextIDLocked() uint64 {
 	m.idAlloc++
 	return m.idAlloc
 }

diff --git a/pkg/storage/spanlatch/manager_test.go b/pkg/storage/spanlatch/manager_test.go
@@ -118,7 +118,7 @@ func TestLatchManager(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	var m Manager
 
-	// Try latch with no overlapping already-acquired lathes.
+	// Try latches with no overlapping already-acquired lathes.
 	lg1 := m.MustAcquire(spans("a", "", write), zeroTS)
 	m.Release(lg1)