From 04e7ecadf64d18f67ca1d0632d8ab71f120ca5e3 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 8 Mar 2018 11:33:27 -0500 Subject: [PATCH] Revert "Temporarily instrument postgres_fdw test to look for statistics changes." This reverts commit c2c537c56dc30ec3cdc12051f4ea5363aa66d73c. It's now clear that whatever is going on there, it can't be blamed on unexpected ANALYZE runs, because the statistics are the same just before the failing query as they were at the start of the test. --- .../postgres_fdw/expected/postgres_fdw.out | 31 ------------------- contrib/postgres_fdw/sql/postgres_fdw.sql | 13 -------- 2 files changed, 44 deletions(-) diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out index cbb5daa239..a2b13846e0 100644 --- a/contrib/postgres_fdw/expected/postgres_fdw.out +++ b/contrib/postgres_fdw/expected/postgres_fdw.out @@ -87,23 +87,6 @@ ANALYZE "S 1"."T 1"; ANALYZE "S 1"."T 2"; ANALYZE "S 1"."T 3"; ANALYZE "S 1"."T 4"; --- record relpages for T 1 -create temp table save_t_1_relpages as - select relpages as old_relpages from pg_class where relname = 'T 1'; -select relpages - (select old_relpages from save_t_1_relpages) as pg_delta, - reltuples from pg_class where relname = 'T 1'; - pg_delta | reltuples -----------+----------- - 0 | 1000 -(1 row) - -select (histogram_bounds::text::int[])[array_length(histogram_bounds,1)] - from pg_stats where tablename = 'T 1' and attname = 'C 1'; - histogram_bounds ------------------- - 1000 -(1 row) - -- =================================================================== -- create foreign tables -- =================================================================== @@ -5537,20 +5520,6 @@ UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *; 2010 | 0 | bar | | | | ft2 | (10 rows) -select relpages - (select old_relpages from save_t_1_relpages) as pg_delta, - reltuples from pg_class where relname = 'T 1'; - pg_delta | reltuples -----------+----------- - 0 | 1000 -(1 row) - -select (histogram_bounds::text::int[])[array_length(histogram_bounds,1)] - from pg_stats where tablename = 'T 1' and attname = 'C 1'; - histogram_bounds ------------------- - 1000 -(1 row) - EXPLAIN (verbose, costs off) UPDATE ft2 SET c3 = 'baz' FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1) diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql index 8b1407b959..4d2e43c9f0 100644 --- a/contrib/postgres_fdw/sql/postgres_fdw.sql +++ b/contrib/postgres_fdw/sql/postgres_fdw.sql @@ -95,15 +95,6 @@ ANALYZE "S 1"."T 2"; ANALYZE "S 1"."T 3"; ANALYZE "S 1"."T 4"; --- record relpages for T 1 -create temp table save_t_1_relpages as - select relpages as old_relpages from pg_class where relname = 'T 1'; - -select relpages - (select old_relpages from save_t_1_relpages) as pg_delta, - reltuples from pg_class where relname = 'T 1'; -select (histogram_bounds::text::int[])[array_length(histogram_bounds,1)] - from pg_stats where tablename = 'T 1' and attname = 'C 1'; - -- =================================================================== -- create foreign tables -- =================================================================== @@ -1148,10 +1139,6 @@ INSERT INTO ft2 (c1,c2,c3) EXPLAIN (verbose, costs off) UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *; -- can't be pushed down UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *; -select relpages - (select old_relpages from save_t_1_relpages) as pg_delta, - reltuples from pg_class where relname = 'T 1'; -select (histogram_bounds::text::int[])[array_length(histogram_bounds,1)] - from pg_stats where tablename = 'T 1' and attname = 'C 1'; EXPLAIN (verbose, costs off) UPDATE ft2 SET c3 = 'baz' FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)