From: Michael Paquier <michael@paquier.xyz>
Date: Sat, 8 Mar 2025 04:39:57 +0000 (+0900)
Subject: Use stricter ordering in regression test query for pg_stat_io
X-Git-Tag: REL_18_BETA1~647
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21f653cc0024100f8ecc279162631f2b1ba8c46c;p=thirdparty%2Fpostgresql.git

Use stricter ordering in regression test query for pg_stat_io

The query introduced in 8b532771a099 is proving to have ordering issues
under at least the locale cs_CZ.  This commit updates the query to use a
stricter ordering.

Per reports from buildfarm members hippopotamus and jay.
---

diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out
index 2707f3400d9..30d763c4aee 100644
--- a/src/test/regress/expected/stats.out
+++ b/src/test/regress/expected/stats.out
@@ -14,7 +14,7 @@ SHOW track_counts;  -- must be on
 -- List of backend types, contexts and objects tracked in pg_stat_io.
 \a
 SELECT backend_type, object, context FROM pg_stat_io
-  ORDER BY backend_type, object, context COLLATE "C";
+  ORDER BY backend_type COLLATE "C", object COLLATE "C", context COLLATE "C";
 backend_type|object|context
 autovacuum launcher|relation|bulkread
 autovacuum launcher|relation|init
diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql
index 7e03af93168..5e7ef20fef6 100644
--- a/src/test/regress/sql/stats.sql
+++ b/src/test/regress/sql/stats.sql
@@ -11,7 +11,7 @@ SHOW track_counts;  -- must be on
 -- List of backend types, contexts and objects tracked in pg_stat_io.
 \a
 SELECT backend_type, object, context FROM pg_stat_io
-  ORDER BY backend_type, object, context COLLATE "C";
+  ORDER BY backend_type COLLATE "C", object COLLATE "C", context COLLATE "C";
 \a
 
 -- ensure that both seqscan and indexscan plans are allowed