@@ -77,15 +77,15 @@ func (i *MVCCIterator) Valid() (bool, error) {
7777// SeekGE is part of the storage.MVCCIterator interface.
7878func (i * MVCCIterator ) SeekGE (key storage.MVCCKey ) {
7979 i .i .SeekGE (key )
80- i .checkAllowed (roachpb. Span {Key : key .Key }, true )
80+ i .checkAllowed (TrickySpan {Key : key .Key }, true )
8181}
8282
8383// SeekLT is part of the storage.MVCCIterator interface.
8484func (i * MVCCIterator ) SeekLT (key storage.MVCCKey ) {
8585 i .i .SeekLT (key )
8686 // CheckAllowed{At} supports the span representation of [,key), which
8787 // corresponds to the span [key.Prev(),).
88- i .checkAllowed (roachpb. Span {EndKey : key .Key }, true )
88+ i .checkAllowed (TrickySpan {EndKey : key .Key }, true )
8989}
9090
9191// Next is part of the storage.MVCCIterator interface.
@@ -117,12 +117,12 @@ func (i *MVCCIterator) checkAllowedCurrPosForward(errIfDisallowed bool) {
117117 // as long as the iterator itself is configured with proper boundaries.
118118 return
119119 }
120- i .checkAllowedValidPos (roachpb. Span {Key : i .UnsafeKey ().Key }, errIfDisallowed )
120+ i .checkAllowedValidPos (TrickySpan {Key : i .UnsafeKey ().Key }, errIfDisallowed )
121121}
122122
123123// checkAllowed checks the provided span if the current iterator position is
124124// valid.
125- func (i * MVCCIterator ) checkAllowed (span roachpb. Span , errIfDisallowed bool ) {
125+ func (i * MVCCIterator ) checkAllowed (span TrickySpan , errIfDisallowed bool ) {
126126 i .invalid = false
127127 i .err = nil
128128 if ok , _ := i .i .Valid (); ! ok {
@@ -134,7 +134,7 @@ func (i *MVCCIterator) checkAllowed(span roachpb.Span, errIfDisallowed bool) {
134134 i .checkAllowedValidPos (span , errIfDisallowed )
135135}
136136
137- func (i * MVCCIterator ) checkAllowedValidPos (span roachpb. Span , errIfDisallowed bool ) {
137+ func (i * MVCCIterator ) checkAllowedValidPos (span TrickySpan , errIfDisallowed bool ) {
138138 var err error
139139 if i .spansOnly {
140140 err = i .spans .CheckAllowed (SpanReadOnly , span )
@@ -213,11 +213,11 @@ func (i *MVCCIterator) FindSplitKey(
213213 start , end , minSplitKey roachpb.Key , targetSize int64 ,
214214) (storage.MVCCKey , error ) {
215215 if i .spansOnly {
216- if err := i .spans .CheckAllowed (SpanReadOnly , roachpb. Span {Key : start , EndKey : end }); err != nil {
216+ if err := i .spans .CheckAllowed (SpanReadOnly , TrickySpan {Key : start , EndKey : end }); err != nil {
217217 return storage.MVCCKey {}, err
218218 }
219219 } else {
220- if err := i .spans .CheckAllowedAt (SpanReadOnly , roachpb. Span {Key : start , EndKey : end }, i .ts ); err != nil {
220+ if err := i .spans .CheckAllowedAt (SpanReadOnly , TrickySpan {Key : start , EndKey : end }, i .ts ); err != nil {
221221 return storage.MVCCKey {}, err
222222 }
223223 }
@@ -261,10 +261,10 @@ func (i *EngineIterator) SeekEngineKeyGE(key storage.EngineKey) (valid bool, err
261261 }
262262 if key .IsMVCCKey () && ! i .spansOnly {
263263 mvccKey , _ := key .ToMVCCKey ()
264- if err := i .spans .CheckAllowedAt (SpanReadOnly , roachpb. Span {Key : mvccKey .Key }, i .ts ); err != nil {
264+ if err := i .spans .CheckAllowedAt (SpanReadOnly , TrickySpan {Key : mvccKey .Key }, i .ts ); err != nil {
265265 return false , err
266266 }
267- } else if err = i .spans .CheckAllowed (SpanReadOnly , roachpb. Span {Key : key .Key }); err != nil {
267+ } else if err = i .spans .CheckAllowed (SpanReadOnly , TrickySpan {Key : key .Key }); err != nil {
268268 return false , err
269269 }
270270 return valid , err
@@ -278,10 +278,10 @@ func (i *EngineIterator) SeekEngineKeyLT(key storage.EngineKey) (valid bool, err
278278 }
279279 if key .IsMVCCKey () && ! i .spansOnly {
280280 mvccKey , _ := key .ToMVCCKey ()
281- if err := i .spans .CheckAllowedAt (SpanReadOnly , roachpb. Span {Key : mvccKey .Key }, i .ts ); err != nil {
281+ if err := i .spans .CheckAllowedAt (SpanReadOnly , TrickySpan {Key : mvccKey .Key }, i .ts ); err != nil {
282282 return false , err
283283 }
284- } else if err = i .spans .CheckAllowed (SpanReadOnly , roachpb. Span {EndKey : key .Key }); err != nil {
284+ } else if err = i .spans .CheckAllowed (SpanReadOnly , TrickySpan {EndKey : key .Key }); err != nil {
285285 return false , err
286286 }
287287 return valid , err
@@ -313,7 +313,7 @@ func (i *EngineIterator) SeekEngineKeyGEWithLimit(
313313 if state != pebble .IterValid {
314314 return state , err
315315 }
316- if err = i .spans .CheckAllowed (SpanReadOnly , roachpb. Span {Key : key .Key }); err != nil {
316+ if err = i .spans .CheckAllowed (SpanReadOnly , TrickySpan {Key : key .Key }); err != nil {
317317 return pebble .IterExhausted , err
318318 }
319319 return state , err
@@ -327,7 +327,7 @@ func (i *EngineIterator) SeekEngineKeyLTWithLimit(
327327 if state != pebble .IterValid {
328328 return state , err
329329 }
330- if err = i .spans .CheckAllowed (SpanReadOnly , roachpb. Span {EndKey : key .Key }); err != nil {
330+ if err = i .spans .CheckAllowed (SpanReadOnly , TrickySpan {EndKey : key .Key }); err != nil {
331331 return pebble .IterExhausted , err
332332 }
333333 return state , err
@@ -354,11 +354,11 @@ func (i *EngineIterator) checkKeyAllowed() (valid bool, err error) {
354354 }
355355 if key .IsMVCCKey () && ! i .spansOnly {
356356 mvccKey , _ := key .ToMVCCKey ()
357- if err := i .spans .CheckAllowedAt (SpanReadOnly , roachpb. Span {Key : mvccKey .Key }, i .ts ); err != nil {
357+ if err := i .spans .CheckAllowedAt (SpanReadOnly , TrickySpan {Key : mvccKey .Key }, i .ts ); err != nil {
358358 // Invalid, but no error.
359359 return false , nil // nolint:returnerrcheck
360360 }
361- } else if err = i .spans .CheckAllowed (SpanReadOnly , roachpb. Span {Key : key .Key }); err != nil {
361+ } else if err = i .spans .CheckAllowed (SpanReadOnly , TrickySpan {Key : key .Key }); err != nil {
362362 // Invalid, but no error.
363363 return false , nil // nolint:returnerrcheck
364364 }
@@ -469,11 +469,11 @@ func (s spanSetReader) MVCCIterate(
469469 f func (storage.MVCCKeyValue , storage.MVCCRangeKeyStack ) error ,
470470) error {
471471 if s .spansOnly {
472- if err := s .spans .CheckAllowed (SpanReadOnly , roachpb. Span {Key : start , EndKey : end }); err != nil {
472+ if err := s .spans .CheckAllowed (SpanReadOnly , TrickySpan {Key : start , EndKey : end }); err != nil {
473473 return err
474474 }
475475 } else {
476- if err := s .spans .CheckAllowedAt (SpanReadOnly , roachpb. Span {Key : start , EndKey : end }, s .ts ); err != nil {
476+ if err := s .spans .CheckAllowedAt (SpanReadOnly , TrickySpan {Key : start , EndKey : end }, s .ts ); err != nil {
477477 return err
478478 }
479479 }
@@ -535,11 +535,11 @@ func (s spanSetWriter) ApplyBatchRepr(repr []byte, sync bool) error {
535535
536536func (s spanSetWriter ) checkAllowed (key roachpb.Key ) error {
537537 if s .spansOnly {
538- if err := s .spans .CheckAllowed (SpanReadWrite , roachpb. Span {Key : key }); err != nil {
538+ if err := s .spans .CheckAllowed (SpanReadWrite , TrickySpan {Key : key }); err != nil {
539539 return err
540540 }
541541 } else {
542- if err := s .spans .CheckAllowedAt (SpanReadWrite , roachpb. Span {Key : key }, s .ts ); err != nil {
542+ if err := s .spans .CheckAllowedAt (SpanReadWrite , TrickySpan {Key : key }, s .ts ); err != nil {
543543 return err
544544 }
545545 }
@@ -561,7 +561,7 @@ func (s spanSetWriter) ClearUnversioned(key roachpb.Key, opts storage.ClearOptio
561561}
562562
563563func (s spanSetWriter ) ClearEngineKey (key storage.EngineKey , opts storage.ClearOptions ) error {
564- if err := s .spans .CheckAllowed (SpanReadWrite , roachpb. Span {Key : key .Key }); err != nil {
564+ if err := s .spans .CheckAllowed (SpanReadWrite , TrickySpan {Key : key .Key }); err != nil {
565565 return err
566566 }
567567 return s .w .ClearEngineKey (key , opts )
@@ -575,11 +575,11 @@ func (s spanSetWriter) SingleClearEngineKey(key storage.EngineKey) error {
575575
576576func (s spanSetWriter ) checkAllowedRange (start , end roachpb.Key ) error {
577577 if s .spansOnly {
578- if err := s .spans .CheckAllowed (SpanReadWrite , roachpb. Span {Key : start , EndKey : end }); err != nil {
578+ if err := s .spans .CheckAllowed (SpanReadWrite , TrickySpan {Key : start , EndKey : end }); err != nil {
579579 return err
580580 }
581581 } else {
582- if err := s .spans .CheckAllowedAt (SpanReadWrite , roachpb. Span {Key : start , EndKey : end }, s .ts ); err != nil {
582+ if err := s .spans .CheckAllowedAt (SpanReadWrite , TrickySpan {Key : start , EndKey : end }, s .ts ); err != nil {
583583 return err
584584 }
585585 }
@@ -661,11 +661,11 @@ func (s spanSetWriter) ClearMVCCRangeKey(rangeKey storage.MVCCRangeKey) error {
661661
662662func (s spanSetWriter ) Merge (key storage.MVCCKey , value []byte ) error {
663663 if s .spansOnly {
664- if err := s .spans .CheckAllowed (SpanReadWrite , roachpb. Span {Key : key .Key }); err != nil {
664+ if err := s .spans .CheckAllowed (SpanReadWrite , TrickySpan {Key : key .Key }); err != nil {
665665 return err
666666 }
667667 } else {
668- if err := s .spans .CheckAllowedAt (SpanReadWrite , roachpb. Span {Key : key .Key }, s .ts ); err != nil {
668+ if err := s .spans .CheckAllowedAt (SpanReadWrite , TrickySpan {Key : key .Key }, s .ts ); err != nil {
669669 return err
670670 }
671671 }
@@ -697,7 +697,7 @@ func (s spanSetWriter) PutEngineKey(key storage.EngineKey, value []byte) error {
697697 if ! s .spansOnly {
698698 panic ("cannot do timestamp checking for putting EngineKey" )
699699 }
700- if err := s .spans .CheckAllowed (SpanReadWrite , roachpb. Span {Key : key .Key }); err != nil {
700+ if err := s .spans .CheckAllowed (SpanReadWrite , TrickySpan {Key : key .Key }); err != nil {
701701 return err
702702 }
703703 return s .w .PutEngineKey (key , value )
0 commit comments