kvserver: rename & unexport RangeID iterator

Epic: none
Release note: none

Author: pav-kv

pkg/kv/kvserver/kvstorage/init.go

@@ -148,14 +148,14 @@ func checkCanInitializeEngine(ctx context.Context, eng storage.Engine) error {
 type readKeyFn func(roachpb.Key, protoutil.Message) (bool, error)
 type scanRangeIDFn func(roachpb.RangeID, readKeyFn) error
 
-// IterateIDPrefixKeys helps visit system keys that use RangeID prefixing (such
+// iterateRangeIDKeys helps visit system keys that use RangeID prefixing (such
 // as RaftHardStateKey, RangeTombstoneKey, and many others). Such keys could in
 // principle exist at any RangeID, and this helper efficiently discovers all the
 // keys of the desired type (as specified by the supplied `keyFn`) and, for each
 // key-value pair discovered, unmarshals it into `msg` and then invokes `f`.
 //
 // Iteration stops on the first error (and will pass through that error).
-func IterateIDPrefixKeys(
+func iterateRangeIDKeys(
 	ctx context.Context, reader storage.Reader, scanRangeID scanRangeIDFn,
 ) error {
 	// NB: Range-ID local keys have no versions and no intents.
@@ -509,7 +509,7 @@ func loadReplicas(ctx context.Context, eng storage.Engine) ([]Replica, error) {
 	// entire raft state (i.e. HardState, TruncatedState, Log).
 	logEvery := log.Every(10 * time.Second)
 	var i int
-	if err := IterateIDPrefixKeys(ctx, eng, func(id roachpb.RangeID, get readKeyFn) error {
+	if err := iterateRangeIDKeys(ctx, eng, func(id roachpb.RangeID, get readKeyFn) error {
 		if logEvery.ShouldLog() && i > 0 { // only log if slow
 			log.KvExec.Infof(ctx, "loaded state for %d/%d replicas", i, len(s))
 		}

pkg/kv/kvserver/kvstorage/init_test.go

@@ -23,10 +23,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// TestIterateIDPrefixKeys lays down a number of tombstones (at keys.RangeTombstoneKey) interspersed
-// with other irrelevant keys (both chosen randomly). It then verifies that IterateIDPrefixKeys
+// TestIterateRangeIDKeys lays down a number of tombstones (at keys.RangeTombstoneKey) interspersed
+// with other irrelevant keys (both chosen randomly). It then verifies that iterateRangeIDKeys
 // correctly returns only the relevant keys and values.
-func TestIterateIDPrefixKeys(t *testing.T) {
+func TestIterateRangeIDKeys(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
@@ -100,7 +100,7 @@ func TestIterateIDPrefixKeys(t *testing.T) {
 	})
 
 	var seen []seenT
-	require.NoError(t, IterateIDPrefixKeys(ctx, eng, func(id roachpb.RangeID, get readKeyFn) error {
+	require.NoError(t, iterateRangeIDKeys(ctx, eng, func(id roachpb.RangeID, get readKeyFn) error {
 		var tombstone kvserverpb.RangeTombstone
 		if ok, err := get(keys.RangeTombstoneKey(id), &tombstone); err != nil {
 			return err