Merge #113726

113726: kvpb: add some more information to BatchRequest.SafeFormat r=yuzefovich a=yuzefovich This commit adds the following information (when non-default): - lock timeout - max span request keys - target bytes - allow empty. Epic: None Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · Nov 3, 2023 · 5aa6a0a · 5aa6a0a
2 parents be845d1 + 38d667b
commit 5aa6a0a
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/pkg/kv/kvpb/batch.go b/pkg/kv/kvpb/batch.go
@@ -855,6 +855,9 @@ func (ba BatchRequest) SafeFormat(s redact.SafePrinter, _ rune) {
 	if ba.WaitPolicy != lock.WaitPolicy_Block {
 		s.Printf(", [wait-policy: %s]", ba.WaitPolicy)
 	}
+	if ba.LockTimeout != 0 {
+		s.Printf(", [lock-timeout: %s]", ba.LockTimeout)
+	}
 	if ba.AmbiguousReplayProtection {
 		s.Printf(", [protect-ambiguous-replay]")
 	}
@@ -871,6 +874,12 @@ func (ba BatchRequest) SafeFormat(s redact.SafePrinter, _ rune) {
 		}
 		s.Printf("]")
 	}
+	if ba.MaxSpanRequestKeys != 0 || ba.TargetBytes != 0 {
+		s.Printf(", [max_span_request_keys: %d], [target_bytes: %d]", ba.MaxSpanRequestKeys, ba.TargetBytes)
+	}
+	if ba.AllowEmpty {
+		s.Print(", [allow-empty]")
+	}
 }
 
 func (ba BatchRequest) String() string {