Merge #154536

craig[bot] · kev-cao · craig[bot] · commit fdcfaed00437 · 2025-10-01T19:15:32.000Z
154536: roachtest: handle null fingerprint in backup/restore roundtrip r=msbutler a=kev-cao Currently, if a table is empty during our backup/restore roundtrip test fingerprint, `SHOW EXPERIMENTAL_FINGERPRINTS` returns `NULL`. This commit teaches our roundtrip tests to properly handle `NULL` fingerprints. Fixes: #154502 Fixes: #154506 Fixes: #154507 Release note: None Co-authored-by: Kevin Cao <39608887+kev-cao@users.noreply.github.com>
diff --git a/pkg/cmd/roachtest/tests/mixed_version_backup.go b/pkg/cmd/roachtest/tests/mixed_version_backup.go
@@ -630,7 +630,7 @@ func (fc *fingerprintContents) Load(
 ) error {
 	l.Printf("computing fingerprints for table %s", fc.table)
 	query := fmt.Sprintf(
-		"SELECT index_name, fingerprint FROM [SHOW EXPERIMENTAL_FINGERPRINTS FROM TABLE %s]%s ORDER BY index_name",
+		"SELECT index_name, COALESCE(fingerprint, '') FROM [SHOW EXPERIMENTAL_FINGERPRINTS FROM TABLE %s]%s ORDER BY index_name",
 		fc.table, aostFor(timestamp),
 	)
 	rows, err := fc.db.QueryContext(ctx, query)

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,7 @@ func (fc *fingerprintContents) Load(`
`630`	`630`	`) error {`
`631`	`631`	`l.Printf("computing fingerprints for table %s", fc.table)`
`632`	`632`	`query := fmt.Sprintf(`
`633`		`- "SELECT index_name, fingerprint FROM [SHOW EXPERIMENTAL_FINGERPRINTS FROM TABLE %s]%s ORDER BY index_name",`
	`633`	`+ "SELECT index_name, COALESCE(fingerprint, '') FROM [SHOW EXPERIMENTAL_FINGERPRINTS FROM TABLE %s]%s ORDER BY index_name",`
`634`	`634`	`fc.table, aostFor(timestamp),`
`635`	`635`	`)`
`636`	`636`	`rows, err := fc.db.QueryContext(ctx, query)`