Merge #152930

craig[bot] · stevendanna · craig[bot] · commit 65656d410f6f · 2025-09-04T09:28:24.000Z
152930: kvtestutils: fix SysBytes regex r=miraradeva a=stevendanna

The | operators precedence meant that the previous regex could match string such as OtherBytes:22.

Epic: none
Release note: None

Co-authored-by: Steven Danna &lt;danna@cockroachlabs.com&gt;
diff --git a/pkg/kv/kvtestutils/consistency.go b/pkg/kv/kvtestutils/consistency.go
@@ -64,7 +64,7 @@ func CheckConsistency(ctx context.Context, db querier, span roachpb.Span) []erro
 				delta = regexp.MustCompile(`LastUpdateNanos:\d+`).ReplaceAllString(delta, "")
 				delta = regexp.MustCompile(`\S+:0\b`).ReplaceAllString(delta, "")
 				// The two cases below correspond to the two linked issues above.
-				if regexp.MustCompile(`^\s*SysBytes:-?10|12|20|22|24\s*$`).MatchString(delta) {
+				if regexp.MustCompile(`^\s*SysBytes:-?(10|12|20|22|24)\s*$`).MatchString(delta) {
 					continue
 				}
 				// The SysCount and SysBytes should be either both positive or negative.

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func CheckConsistency(ctx context.Context, db querier, span roachpb.Span) []erro`
`64`	`64`	delta = regexp.MustCompile(`LastUpdateNanos:\d+`).ReplaceAllString(delta, "")
`65`	`65`	delta = regexp.MustCompile(`\S+:0\b`).ReplaceAllString(delta, "")
`66`	`66`	`// The two cases below correspond to the two linked issues above.`
`67`		- if regexp.MustCompile(`^\sSysBytes:-?10\|12\|20\|22\|24\s$`).MatchString(delta) {
	`67`	+ if regexp.MustCompile(`^\sSysBytes:-?(10\|12\|20\|22\|24)\s$`).MatchString(delta) {
`68`	`68`	`continue`
`69`	`69`	`}`
`70`	`70`	`// The SysCount and SysBytes should be either both positive or negative.`