Merge #158340

158340: kvserver,sql: clarify log/state engine in more tests r=arulajmani a=pav-kv

Part of #97627

Co-authored-by: Pavel Kalinnikov <[email protected]>

Author: craig[bot]

pkg/backup/full_cluster_backup_restore_test.go

@@ -241,7 +241,7 @@ CREATE TABLE data2.foo (a int);
 			store := tcRestore.GetFirstStoreFromServer(t, 0)
 			startKey := keys.SystemSQLCodec.TablePrefix(uint32(id))
 			endKey := startKey.PrefixEnd()
-			it, err := store.TODOEngine().NewMVCCIterator(context.Background(), storage.MVCCKeyAndIntentsIterKind, storage.IterOptions{
+			it, err := store.StateEngine().NewMVCCIterator(context.Background(), storage.MVCCKeyAndIntentsIterKind, storage.IterOptions{
 				UpperBound: endKey,
 			})
 			require.NoError(t, err)

pkg/crosscluster/physical/replication_random_client_test.go

@@ -322,7 +322,7 @@ func assertExactlyEqualKVs(
 ) hlc.Timestamp {
 	// Iterate over the store.
 	store := tc.GetFirstStoreFromServer(t, 0)
-	it, err := store.TODOEngine().NewMVCCIterator(context.Background(), storage.MVCCKeyIterKind, storage.IterOptions{
+	it, err := store.StateEngine().NewMVCCIterator(context.Background(), storage.MVCCKeyIterKind, storage.IterOptions{
 		LowerBound: tenantSpan.Key,
 		UpperBound: tenantSpan.EndKey,
 	})

pkg/crosscluster/physical/stream_ingestion_processor_test.go

@@ -442,7 +442,7 @@ func assertEqualKVs(
 	// Iterate over the store.
 	store, err := srv.StorageLayer().GetStores().(*kvserver.Stores).GetStore(srv.GetFirstStoreID())
 	require.NoError(t, err)
-	it, err := store.TODOEngine().NewMVCCIterator(context.Background(), storage.MVCCKeyAndIntentsIterKind, storage.IterOptions{
+	it, err := store.StateEngine().NewMVCCIterator(context.Background(), storage.MVCCKeyAndIntentsIterKind, storage.IterOptions{
 		LowerBound: targetSpan.Key,
 		UpperBound: targetSpan.EndKey,
 	})

pkg/kv/kvserver/batcheval/cmd_add_sstable_test.go

@@ -1696,7 +1696,7 @@ func TestAddSSTableSSTTimestampToRequestTimestampRespectsClosedTS(t *testing.T)
 	require.True(t, closedTS.LessEq(writeTS), "timestamp %s below closed timestamp %s", result.Timestamp, closedTS)
 
 	// Check that the value was in fact written at the write timestamp.
-	kvs, err := storage.Scan(context.Background(), store.TODOEngine(), key, key.Next(), 0)
+	kvs, err := storage.Scan(context.Background(), store.StateEngine(), key, key.Next(), 0)
 	require.NoError(t, err)
 	require.Len(t, kvs, 1)
 	require.Equal(t, storage.MVCCKey{Key: key, Timestamp: writeTS}, kvs[0].Key)

pkg/kv/kvserver/batcheval/knobs_use_range_tombstones_test.go

@@ -45,7 +45,6 @@ func TestKnobsUseRangeTombstonesForPointDeletes(t *testing.T) {
 
 	store, err := s.GetStores().(*kvserver.Stores).GetStore(s.GetFirstStoreID())
 	require.NoError(t, err)
-	eng := store.TODOEngine()
 	txn := db.NewTxn(ctx, "test")
 
 	// Write a non-transactional and transactional tombstone.
@@ -76,7 +75,7 @@ func TestKnobsUseRangeTombstonesForPointDeletes(t *testing.T) {
 
 	// Assert that they're now range tombstones.
 	var rangeTombstones []storage.MVCCRangeKey
-	for _, kvI := range storageutils.ScanKeySpan(t, eng, roachpb.Key("a"), roachpb.Key("z")) {
+	for _, kvI := range storageutils.ScanKeySpan(t, store.StateEngine(), roachpb.Key("a"), roachpb.Key("z")) {
 		switch kv := kvI.(type) {
 		case storage.MVCCRangeKeyValue:
 			kv.RangeKey.Timestamp = hlc.Timestamp{}

pkg/kv/kvserver/client_replica_test.go

@@ -5358,7 +5358,7 @@ func TestRangeMigration(t *testing.T) {
 		}
 
 		sl := kvstorage.MakeStateLoader(rangeID)
-		persistedV, err := sl.LoadVersion(ctx, store.TODOEngine())
+		persistedV, err := sl.LoadVersion(ctx, store.StateEngine())
 		if err != nil {
 			t.Fatal(err)
 		}

pkg/kv/kvserver/client_store_test.go

@@ -104,7 +104,7 @@ func TestStoreRaftReplicaID(t *testing.T) {
 	rhsRepl, err := store.GetReplica(rhsDesc.RangeID)
 	require.NoError(t, err)
 	rhsReplicaID, err :=
-		kvstorage.MakeStateLoader(rhsDesc.RangeID).LoadRaftReplicaID(ctx, store.TODOEngine())
+		kvstorage.MakeStateLoader(rhsDesc.RangeID).LoadRaftReplicaID(ctx, store.StateEngine())
 	require.NoError(t, err)
 	require.Equal(t, rhsRepl.ReplicaID(), rhsReplicaID.ReplicaID)
 }

pkg/kv/kvserver/consistency_queue_test.go

@@ -358,7 +358,7 @@ func TestCheckConsistencyInconsistent(t *testing.T) {
 	var val roachpb.Value
 	val.SetInt(42)
 	// Put an inconsistent key "e" to s2, and have s1 and s3 still agree.
-	_, err := storage.MVCCPut(context.Background(), s2.TODOEngine(),
+	_, err := storage.MVCCPut(context.Background(), s2.StateEngine(),
 		roachpb.Key("e"), tc.Server(0).Clock().Now(), val, storage.MVCCWriteOptions{})
 	require.NoError(t, err)
 

pkg/kv/kvserver/flow_control_integration_test.go

@@ -2921,7 +2921,7 @@ func TestFlowControlSendQueueRangeMigrate(t *testing.T) {
 		}
 
 		sl := kvstorage.MakeStateLoader(desc.RangeID)
-		persistedV, err := sl.LoadVersion(ctx, store.TODOEngine())
+		persistedV, err := sl.LoadVersion(ctx, store.StateEngine())
 		if err != nil {
 			return err
 		}

pkg/kv/kvserver/intent_resolver_integration_test.go

@@ -191,7 +191,7 @@ func TestReliableIntentCleanup(t *testing.T) {
 	skip.UnderDeadlock(t, "timing-sensitive test")
 	//skip.UnderStress(t, "memory-hungry test")
 
-	prefix := roachpb.Key([]byte("key\x00"))
+	prefix := roachpb.Key("key\x00")
 
 	testutils.RunTrueAndFalse(t, "ForceSyncIntentResolution", func(t *testing.T, forceSync bool) {
 		// abortHeartbeats is used to abort txn heartbeats, returning
@@ -355,7 +355,7 @@ func TestReliableIntentCleanup(t *testing.T) {
 				started            = timeutil.Now()
 			)
 			for {
-				result, err := storage.MVCCScan(ctx, store.TODOEngine(), prefix, prefix.PrefixEnd(),
+				result, err := storage.MVCCScan(ctx, store.StateEngine(), prefix, prefix.PrefixEnd(),
 					hlc.MaxTimestamp, storage.MVCCScanOptions{Inconsistent: true})
 				require.NoError(t, err)
 				intentCount := len(result.Intents)
@@ -388,7 +388,7 @@ func TestReliableIntentCleanup(t *testing.T) {
 			var txnEntry roachpb.Transaction
 			if !assert.Eventually(t, func() bool {
 				key := keys.TransactionKey(txnKey, txnID)
-				ok, err := storage.MVCCGetProto(ctx, store.TODOEngine(), key, hlc.MaxTimestamp, &txnEntry,
+				ok, err := storage.MVCCGetProto(ctx, store.StateEngine(), key, hlc.MaxTimestamp, &txnEntry,
 					storage.MVCCGetOptions{})
 				require.NoError(t, err)
 				return !ok