Merge #154021

154021: kvnemesis: expect nil bytes in CPuts r=miraradeva a=stevendanna

A CPut that expects a non-existent key needs to set a nil expected bytes. MakeValueFromBytes will return a non-nil byte slice (containing the BYTES type tag) if given a nil byte slice.

Epic: none
Release note: None

Co-authored-by: Steven Danna <[email protected]>

Author: craig[bot]

pkg/kv/kvnemesis/applier.go

@@ -349,11 +349,14 @@ func applyClientOp(
 		o.Result.OptionalTimestamp = ts
 	case *CPutOperation:
 		_, ts, err := dbRunWithResultAndTimestamp(ctx, db, func(b *kv.Batch) {
-			expVal := roachpb.MakeValueFromBytes(o.ExpVal)
+			var expBytes []byte
+			if o.ExpVal != nil {
+				expBytes = roachpb.MakeValueFromBytes(o.ExpVal).TagAndDataBytes()
+			}
 			if o.AllowIfDoesNotExist {
-				b.CPutAllowingIfNotExists(o.Key, o.Value(), expVal.TagAndDataBytes())
+				b.CPutAllowingIfNotExists(o.Key, o.Value(), expBytes)
 			} else {
-				b.CPut(o.Key, o.Value(), expVal.TagAndDataBytes())
+				b.CPut(o.Key, o.Value(), expBytes)
 			}
 			setLastReqSeq(b, o.Seq)
 		})

pkg/kv/kvnemesis/validator.go

@@ -499,11 +499,11 @@ func (v *validator) processOp(op Operation) {
 		if e := (*kvpb.ConditionFailedError)(nil); errors.As(err, &e) {
 			// If the CPut failed, the actual value (in the ConditionFailedError) is
 			// observed, and the CPut's write is not observed.
+			observedVal := roachpb.Value{}
 			if e.ActualValue != nil {
-				if valueBytes, err := e.ActualValue.GetBytes(); err == nil {
-					readObservation.Value = roachpb.MakeValueFromBytes(valueBytes)
-				}
+				observedVal.RawBytes = e.ActualValue.RawBytes
 			}
+			readObservation.Value = observedVal
 			v.curObservations = append(v.curObservations, readObservation)
 		} else {
 			// If the CPut succeeded, the expected value is observed, and the CPut's
@@ -512,7 +512,11 @@ func (v *validator) processOp(op Operation) {
 				// If AllowIfDoesNotExist == true, we don't know if the read found the
 				// expected value or no value, so we can't add a read observation.
 				// Otherwise, it must have observed the expected value.
-				readObservation.Value = roachpb.MakeValueFromBytes(t.ExpVal)
+				observedVal := roachpb.Value{}
+				if t.ExpVal != nil {
+					observedVal = roachpb.MakeValueFromBytes(t.ExpVal)
+				}
+				readObservation.Value = observedVal
 				v.curObservations = append(v.curObservations, readObservation)
 			}
 			if sv, ok := v.tryConsumeWrite(t.Key, t.Seq); ok {