From 507df08422a3eb18b00d8bfa7eb126e22fc71901 Mon Sep 17 00:00:00 2001 From: Halil Ozan Akgul Date: Thu, 9 Dec 2021 12:28:11 +0300 Subject: [PATCH] Fix metadata sync fails on propagate_statistics and pg13_propagate_statistics tests --- src/test/regress/expected/pg13_propagate_statistics.out | 1 + src/test/regress/expected/propagate_statistics.out | 7 +++++-- src/test/regress/multi_1_schedule | 3 --- src/test/regress/sql/pg13_propagate_statistics.sql | 1 + src/test/regress/sql/propagate_statistics.sql | 7 +++++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/test/regress/expected/pg13_propagate_statistics.out b/src/test/regress/expected/pg13_propagate_statistics.out index b490e6c55..583a17d86 100644 --- a/src/test/regress/expected/pg13_propagate_statistics.out +++ b/src/test/regress/expected/pg13_propagate_statistics.out @@ -38,6 +38,7 @@ WHERE stxnamespace IN ( FROM pg_namespace WHERE nspname IN ('statistics''TestTarget') ) +AND stxname SIMILAR TO '%\_\d+' ORDER BY stxstattarget, stxrelid::regclass ASC; stxstattarget | stxrelid --------------------------------------------------------------------- diff --git a/src/test/regress/expected/propagate_statistics.out b/src/test/regress/expected/propagate_statistics.out index fd4f8e6e2..1068fa6d2 100644 --- a/src/test/regress/expected/propagate_statistics.out +++ b/src/test/regress/expected/propagate_statistics.out @@ -108,6 +108,7 @@ WHERE stxnamespace IN ( FROM pg_namespace WHERE nspname IN ('public', 'statistics''Test', 'sc1', 'sc2') ) +AND stxname SIMILAR TO '%\_\d+' ORDER BY stxname ASC; stxname --------------------------------------------------------------------- @@ -215,7 +216,8 @@ WHERE stxnamespace IN ( SELECT oid FROM pg_namespace WHERE nspname IN ('public', 'statistics''Test', 'sc1', 'sc2') -); +) +AND stxname SIMILAR TO '%\_\d+'; count --------------------------------------------------------------------- 3 @@ -227,7 +229,8 @@ WHERE stxnamespace IN ( SELECT oid FROM pg_namespace WHERE nspname IN ('public', 'statistics''Test', 'sc1', 'sc2') -); +) +AND stxname SIMILAR TO '%\_\d+'; count --------------------------------------------------------------------- 3 diff --git a/src/test/regress/multi_1_schedule b/src/test/regress/multi_1_schedule index 11e763400..7670fb789 100644 --- a/src/test/regress/multi_1_schedule +++ b/src/test/regress/multi_1_schedule @@ -103,11 +103,8 @@ test: multi_create_fdw # ---------- # Tests for statistics propagation # ---------- -test: check_mx -test: turn_mx_off test: propagate_statistics test: pg13_propagate_statistics -test: turn_mx_on # ---------- # Test for updating table statistics diff --git a/src/test/regress/sql/pg13_propagate_statistics.sql b/src/test/regress/sql/pg13_propagate_statistics.sql index f32cbcb77..e47b111fb 100644 --- a/src/test/regress/sql/pg13_propagate_statistics.sql +++ b/src/test/regress/sql/pg13_propagate_statistics.sql @@ -38,6 +38,7 @@ WHERE stxnamespace IN ( FROM pg_namespace WHERE nspname IN ('statistics''TestTarget') ) +AND stxname SIMILAR TO '%\_\d+' ORDER BY stxstattarget, stxrelid::regclass ASC; \c - - - :master_port diff --git a/src/test/regress/sql/propagate_statistics.sql b/src/test/regress/sql/propagate_statistics.sql index 898387eaa..a66a108c6 100644 --- a/src/test/regress/sql/propagate_statistics.sql +++ b/src/test/regress/sql/propagate_statistics.sql @@ -89,6 +89,7 @@ WHERE stxnamespace IN ( FROM pg_namespace WHERE nspname IN ('public', 'statistics''Test', 'sc1', 'sc2') ) +AND stxname SIMILAR TO '%\_\d+' ORDER BY stxname ASC; SELECT count(DISTINCT stxnamespace) @@ -97,7 +98,8 @@ WHERE stxnamespace IN ( SELECT oid FROM pg_namespace WHERE nspname IN ('public', 'statistics''Test', 'sc1', 'sc2') -); +) +AND stxname SIMILAR TO '%\_\d+'; SELECT COUNT(DISTINCT stxowner) FROM pg_statistic_ext @@ -105,7 +107,8 @@ WHERE stxnamespace IN ( SELECT oid FROM pg_namespace WHERE nspname IN ('public', 'statistics''Test', 'sc1', 'sc2') -); +) +AND stxname SIMILAR TO '%\_\d+'; \c - - - :master_port SET client_min_messages TO WARNING;