sql: remove some redundant kv.TestingIsRangeLookupRequest calls in tests

These were redundant because we have GetRequests in all call sites.

Release note: None

Author: yuzefovich

pkg/kv/range_lookup.go

@@ -450,10 +450,19 @@ func kvsToRangeDescriptors(kvs []roachpb.KeyValue) ([]roachpb.RangeDescriptor, e
 // RangeLookup scan. It can return false positives and should only be used in
 // tests.
 func TestingIsRangeLookup(ba *kvpb.BatchRequest) bool {
-	if ba.IsSingleRequest() {
-		return TestingIsRangeLookupRequest(ba.Requests[0].GetInner())
+	if !ba.IsSingleRequest() {
+		return false
+	}
+	req := ba.Requests[0].GetInner()
+	switch req.(type) {
+	case *kvpb.ScanRequest:
+	case *kvpb.ReverseScanRequest:
+	default:
+		return false
 	}
-	return false
+	s := req.Header()
+	return rangeLookupStartKeyBounds.ContainsKey(s.Key) &&
+		rangeLookupEndKeyBounds.ContainsKey(s.EndKey)
 }
 
 // These spans bounds the start and end keys of the spans returned from
@@ -467,18 +476,3 @@ var rangeLookupEndKeyBounds = roachpb.Span{
 	Key:    keys.Meta1Prefix.Next(),
 	EndKey: keys.SystemPrefix.Next(),
 }
-
-// TestingIsRangeLookupRequest returns if the provided Request looks like a single
-// RangeLookup scan. It can return false positives and should only be used in
-// tests.
-func TestingIsRangeLookupRequest(req kvpb.Request) bool {
-	switch req.(type) {
-	case *kvpb.ScanRequest:
-	case *kvpb.ReverseScanRequest:
-	default:
-		return false
-	}
-	s := req.Header()
-	return rangeLookupStartKeyBounds.ContainsKey(s.Key) &&
-		rangeLookupEndKeyBounds.ContainsKey(s.EndKey)
-}

pkg/sql/as_of_test.go

@@ -14,7 +14,6 @@ import (
 	"github.com/cockroachdb/apd/v3"
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
-	"github.com/cockroachdb/cockroach/pkg/kv"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverbase"
 	"github.com/cockroachdb/cockroach/pkg/sql"
@@ -313,9 +312,6 @@ func TestAsOfRetry(t *testing.T) {
 
 			switch req := args.Req.(type) {
 			case *kvpb.GetRequest:
-				if kv.TestingIsRangeLookupRequest(req) {
-					return nil
-				}
 				for key, count := range magicVals.restartCounts {
 					if err := checkCorrectTxn(string(req.Key), magicVals, args.Hdr.Txn); err != nil {
 						return kvpb.NewError(err)

pkg/sql/txn_restart_test.go

@@ -20,7 +20,6 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/keys"
-	"github.com/cockroachdb/cockroach/pkg/kv"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
@@ -1212,7 +1211,7 @@ func TestNonRetryableError(t *testing.T) {
 	cleanupFilter := cmdFilters.AppendFilter(
 		func(args kvserverbase.FilterArgs) *kvpb.Error {
 			if req, ok := args.Req.(*kvpb.GetRequest); ok {
-				if bytes.Contains(req.Key, testKey) && !kv.TestingIsRangeLookupRequest(req) {
+				if bytes.Contains(req.Key, testKey) {
 					hitError = true
 					return kvpb.NewErrorWithTxn(fmt.Errorf("testError"), args.Hdr.Txn)
 				}
@@ -1260,7 +1259,7 @@ func TestReacquireLeaseOnRestart(t *testing.T) {
 	) *kvpb.Error {
 		for _, ru := range ba.Requests {
 			if req := ru.GetGet(); req != nil {
-				if bytes.Contains(req.Key, testKey) && !kv.TestingIsRangeLookupRequest(req) {
+				if bytes.Contains(req.Key, testKey) {
 					if atomic.LoadInt32(&clockUpdate) == 0 {
 						atomic.AddInt32(&clockUpdate, 1)
 						// Hack to advance the transaction timestamp on a
@@ -1358,7 +1357,7 @@ func TestFlushUncommittedDescriptorCacheOnRestart(t *testing.T) {
 			}
 
 			if req, ok := args.Req.(*kvpb.GetRequest); ok {
-				if bytes.Contains(req.Key, testKey) && !kv.TestingIsRangeLookupRequest(req) {
+				if bytes.Contains(req.Key, testKey) {
 					atomic.AddInt32(&restartDone, 1)
 					// Return ReadWithinUncertaintyIntervalError.
 					txn := args.Hdr.Txn