Merge pull request #156957 from yuzefovich/blathers/backport-release-25.4-156823

yuzefovich · web-flow · commit 19d91ffcd731 · 2025-11-05T12:49:32.000-08:00
release-25.4: logictest: add retry directive to one query that relies on stats
diff --git a/pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_cascade b/pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_cascade
@@ -64,7 +64,7 @@ SELECT crdb_internal.clear_table_stats_cache();
 
 # Only the scan in the main query is parallelized when we don't have stats on
 # the descendant tables.
-query I
+query I retry
 SELECT count(*) FROM [EXPLAIN (VERBOSE) DELETE FROM great_grandparent WHERE i = 1] WHERE info LIKE '%parallel%';
 ----
 1

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ SELECT crdb_internal.clear_table_stats_cache();`
`64`	`64`
`65`	`65`	`# Only the scan in the main query is parallelized when we don't have stats on`
`66`	`66`	`# the descendant tables.`
`67`		`-query I`
	`67`	`+query I retry`
`68`	`68`	`SELECT count(*) FROM [EXPLAIN (VERBOSE) DELETE FROM great_grandparent WHERE i = 1] WHERE info LIKE '%parallel%';`
`69`	`69`	`----`
`70`	`70`	`1`