Skip to content

Commit 882ea50

Browse files
robertmhaasrobertmhaas
committed
postgres_fdw: Remove CTID output from some tests.
Commit 1bc0100 added these tests, but they're not stable enough to survive in the buildfarm. Remove CTIDs from the output in the hopes of fixing that.
1 parent 1bc0100 commit 882ea50

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

‎contrib/postgres_fdw/expected/postgres_fdw.out‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5417,44 +5417,44 @@ EXPLAIN (verbose, costs off)
54175417
UPDATE ft2 SET c3 = 'foo'
54185418
FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
54195419
WHERE ft2.c1 > 1200 AND ft2.c2 = ft4.c1
5420-
RETURNING ft2.ctid, ft2, ft2.*, ft4.ctid, ft4, ft4.*; -- can be pushed down
5421-
QUERY PLAN
5422-
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
5420+
RETURNING ft2, ft2.*, ft4, ft4.*; -- can be pushed down
5421+
QUERY PLAN
5422+
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
54235423
Update on public.ft2
5424-
Output: ft2.ctid, ft2.*, ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft4.ctid, ft4.*, ft4.c1, ft4.c2, ft4.c3
5424+
Output: ft2.*, ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft4.*, ft4.c1, ft4.c2, ft4.c3
54255425
-> Foreign Update
5426-
Remote SQL: UPDATE "S 1"."T 1" r1 SET c3 = 'foo'::text FROM ("S 1"."T 3" r2 INNER JOIN "S 1"."T 4" r3 ON (TRUE)) WHERE ((r2.c1 = r3.c1)) AND ((r1.c2 = r2.c1)) AND ((r1."C 1" > 1200)) RETURNING r1."C 1", r1.c2, r1.c3, r1.c4, r1.c5, r1.c6, r1.c7, r1.c8, r1.ctid, r2.ctid, CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2.c1, r2.c2, r2.c3) END, r2.c1, r2.c2, r2.c3
5426+
Remote SQL: UPDATE "S 1"."T 1" r1 SET c3 = 'foo'::text FROM ("S 1"."T 3" r2 INNER JOIN "S 1"."T 4" r3 ON (TRUE)) WHERE ((r2.c1 = r3.c1)) AND ((r1.c2 = r2.c1)) AND ((r1."C 1" > 1200)) RETURNING r1."C 1", r1.c2, r1.c3, r1.c4, r1.c5, r1.c6, r1.c7, r1.c8, CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2.c1, r2.c2, r2.c3) END, r2.c1, r2.c2, r2.c3
54275427
(4 rows)
54285428

54295429
UPDATE ft2 SET c3 = 'foo'
54305430
FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
54315431
WHERE ft2.c1 > 1200 AND ft2.c2 = ft4.c1
5432-
RETURNING ft2.ctid, ft2, ft2.*, ft4.ctid, ft4, ft4.*;
5433-
ctid | ft2 | c1 | c2 | c3 | c4 | c5 | c6 | c7 | c8 | ctid | ft4 | c1 | c2 | c3
5434-
----------+--------------------------------+------+----+-----+----+----+----+------------+----+--------+----------------+----+----+--------
5435-
(12,102) | (1206,6,foo,,,,"ft2 ",) | 1206 | 6 | foo | | | | ft2 | | (0,6) | (6,7,AAA006) | 6 | 7 | AAA006
5436-
(12,103) | (1212,12,foo,,,,"ft2 ",) | 1212 | 12 | foo | | | | ft2 | | (0,12) | (12,13,AAA012) | 12 | 13 | AAA012
5437-
(12,104) | (1218,18,foo,,,,"ft2 ",) | 1218 | 18 | foo | | | | ft2 | | (0,18) | (18,19,AAA018) | 18 | 19 | AAA018
5438-
(12,105) | (1224,24,foo,,,,"ft2 ",) | 1224 | 24 | foo | | | | ft2 | | (0,24) | (24,25,AAA024) | 24 | 25 | AAA024
5439-
(12,106) | (1230,30,foo,,,,"ft2 ",) | 1230 | 30 | foo | | | | ft2 | | (0,30) | (30,31,AAA030) | 30 | 31 | AAA030
5440-
(12,107) | (1236,36,foo,,,,"ft2 ",) | 1236 | 36 | foo | | | | ft2 | | (0,36) | (36,37,AAA036) | 36 | 37 | AAA036
5441-
(12,108) | (1242,42,foo,,,,"ft2 ",) | 1242 | 42 | foo | | | | ft2 | | (0,42) | (42,43,AAA042) | 42 | 43 | AAA042
5442-
(12,109) | (1248,48,foo,,,,"ft2 ",) | 1248 | 48 | foo | | | | ft2 | | (0,48) | (48,49,AAA048) | 48 | 49 | AAA048
5443-
(12,110) | (1254,54,foo,,,,"ft2 ",) | 1254 | 54 | foo | | | | ft2 | | (0,54) | (54,55,AAA054) | 54 | 55 | AAA054
5444-
(12,111) | (1260,60,foo,,,,"ft2 ",) | 1260 | 60 | foo | | | | ft2 | | (0,60) | (60,61,AAA060) | 60 | 61 | AAA060
5445-
(12,112) | (1266,66,foo,,,,"ft2 ",) | 1266 | 66 | foo | | | | ft2 | | (0,66) | (66,67,AAA066) | 66 | 67 | AAA066
5446-
(12,113) | (1272,72,foo,,,,"ft2 ",) | 1272 | 72 | foo | | | | ft2 | | (0,72) | (72,73,AAA072) | 72 | 73 | AAA072
5447-
(12,114) | (1278,78,foo,,,,"ft2 ",) | 1278 | 78 | foo | | | | ft2 | | (0,78) | (78,79,AAA078) | 78 | 79 | AAA078
5448-
(12,115) | (1284,84,foo,,,,"ft2 ",) | 1284 | 84 | foo | | | | ft2 | | (0,84) | (84,85,AAA084) | 84 | 85 | AAA084
5449-
(12,116) | (1290,90,foo,,,,"ft2 ",) | 1290 | 90 | foo | | | | ft2 | | (0,90) | (90,91,AAA090) | 90 | 91 | AAA090
5450-
(12,117) | (1296,96,foo,,,,"ft2 ",) | 1296 | 96 | foo | | | | ft2 | | (0,96) | (96,97,AAA096) | 96 | 97 | AAA096
5432+
RETURNING ft2, ft2.*, ft4, ft4.*;
5433+
ft2 | c1 | c2 | c3 | c4 | c5 | c6 | c7 | c8 | ft4 | c1 | c2 | c3
5434+
--------------------------------+------+----+-----+----+----+----+------------+----+----------------+----+----+--------
5435+
(1206,6,foo,,,,"ft2 ",) | 1206 | 6 | foo | | | | ft2 | | (6,7,AAA006) | 6 | 7 | AAA006
5436+
(1212,12,foo,,,,"ft2 ",) | 1212 | 12 | foo | | | | ft2 | | (12,13,AAA012) | 12 | 13 | AAA012
5437+
(1218,18,foo,,,,"ft2 ",) | 1218 | 18 | foo | | | | ft2 | | (18,19,AAA018) | 18 | 19 | AAA018
5438+
(1224,24,foo,,,,"ft2 ",) | 1224 | 24 | foo | | | | ft2 | | (24,25,AAA024) | 24 | 25 | AAA024
5439+
(1230,30,foo,,,,"ft2 ",) | 1230 | 30 | foo | | | | ft2 | | (30,31,AAA030) | 30 | 31 | AAA030
5440+
(1236,36,foo,,,,"ft2 ",) | 1236 | 36 | foo | | | | ft2 | | (36,37,AAA036) | 36 | 37 | AAA036
5441+
(1242,42,foo,,,,"ft2 ",) | 1242 | 42 | foo | | | | ft2 | | (42,43,AAA042) | 42 | 43 | AAA042
5442+
(1248,48,foo,,,,"ft2 ",) | 1248 | 48 | foo | | | | ft2 | | (48,49,AAA048) | 48 | 49 | AAA048
5443+
(1254,54,foo,,,,"ft2 ",) | 1254 | 54 | foo | | | | ft2 | | (54,55,AAA054) | 54 | 55 | AAA054
5444+
(1260,60,foo,,,,"ft2 ",) | 1260 | 60 | foo | | | | ft2 | | (60,61,AAA060) | 60 | 61 | AAA060
5445+
(1266,66,foo,,,,"ft2 ",) | 1266 | 66 | foo | | | | ft2 | | (66,67,AAA066) | 66 | 67 | AAA066
5446+
(1272,72,foo,,,,"ft2 ",) | 1272 | 72 | foo | | | | ft2 | | (72,73,AAA072) | 72 | 73 | AAA072
5447+
(1278,78,foo,,,,"ft2 ",) | 1278 | 78 | foo | | | | ft2 | | (78,79,AAA078) | 78 | 79 | AAA078
5448+
(1284,84,foo,,,,"ft2 ",) | 1284 | 84 | foo | | | | ft2 | | (84,85,AAA084) | 84 | 85 | AAA084
5449+
(1290,90,foo,,,,"ft2 ",) | 1290 | 90 | foo | | | | ft2 | | (90,91,AAA090) | 90 | 91 | AAA090
5450+
(1296,96,foo,,,,"ft2 ",) | 1296 | 96 | foo | | | | ft2 | | (96,97,AAA096) | 96 | 97 | AAA096
54515451
(16 rows)
54525452

54535453
EXPLAIN (verbose, costs off)
54545454
DELETE FROM ft2
54555455
USING ft4 LEFT JOIN ft5 ON (ft4.c1 = ft5.c1)
54565456
WHERE ft2.c1 > 1200 AND ft2.c1 % 10 = 0 AND ft2.c2 = ft4.c1
5457-
RETURNING 100; -- can be pushed down
5457+
RETURNING 100; -- can be pushed down
54585458
QUERY PLAN
54595459
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
54605460
Delete on public.ft2
@@ -5561,12 +5561,12 @@ EXPLAIN (verbose, costs off)
55615561
DELETE FROM ft2
55625562
USING ft4 INNER JOIN ft5 ON (ft4.c1 === ft5.c1)
55635563
WHERE ft2.c1 > 2000 AND ft2.c2 = ft4.c1
5564-
RETURNING ft2.ctid, ft2.c1, ft2.c2, ft2.c3; -- can't be pushed down
5564+
RETURNING ft2.c1, ft2.c2, ft2.c3; -- can't be pushed down
55655565
QUERY PLAN
55665566
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
55675567
Delete on public.ft2
5568-
Output: ft2.ctid, ft2.c1, ft2.c2, ft2.c3
5569-
Remote SQL: DELETE FROM "S 1"."T 1" WHERE ctid = $1 RETURNING "C 1", c2, c3, ctid
5568+
Output: ft2.c1, ft2.c2, ft2.c3
5569+
Remote SQL: DELETE FROM "S 1"."T 1" WHERE ctid = $1 RETURNING "C 1", c2, c3
55705570
-> Foreign Scan
55715571
Output: ft2.ctid, ft4.*, ft5.*
55725572
Filter: (ft4.c1 === ft5.c1)
@@ -5591,10 +5591,10 @@ DELETE FROM ft2
55915591
DELETE FROM ft2
55925592
USING ft4 INNER JOIN ft5 ON (ft4.c1 === ft5.c1)
55935593
WHERE ft2.c1 > 2000 AND ft2.c2 = ft4.c1
5594-
RETURNING ft2.ctid, ft2.c1, ft2.c2, ft2.c3;
5595-
ctid | c1 | c2 | c3
5596-
----------+------+----+-----
5597-
(12,112) | 2006 | 6 | baz
5594+
RETURNING ft2.c1, ft2.c2, ft2.c3;
5595+
c1 | c2 | c3
5596+
------+----+-----
5597+
2006 | 6 | baz
55985598
(1 row)
55995599

56005600
DELETE FROM ft2 WHERE ft2.c1 > 2000;

‎contrib/postgres_fdw/sql/postgres_fdw.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,16 +1109,16 @@ EXPLAIN (verbose, costs off)
11091109
UPDATE ft2 SET c3 = 'foo'
11101110
FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
11111111
WHERE ft2.c1 > 1200 AND ft2.c2 = ft4.c1
1112-
RETURNING ft2.ctid, ft2, ft2.*, ft4.ctid, ft4, ft4.*; -- can be pushed down
1112+
RETURNING ft2, ft2.*, ft4, ft4.*; -- can be pushed down
11131113
UPDATE ft2 SET c3 = 'foo'
11141114
FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
11151115
WHERE ft2.c1 > 1200 AND ft2.c2 = ft4.c1
1116-
RETURNING ft2.ctid, ft2, ft2.*, ft4.ctid, ft4, ft4.*;
1116+
RETURNING ft2, ft2.*, ft4, ft4.*;
11171117
EXPLAIN (verbose, costs off)
11181118
DELETE FROM ft2
11191119
USING ft4 LEFT JOIN ft5 ON (ft4.c1 = ft5.c1)
11201120
WHERE ft2.c1 > 1200 AND ft2.c1 % 10 = 0 AND ft2.c2 = ft4.c1
1121-
RETURNING 100; -- can be pushed down
1121+
RETURNING 100; -- can be pushed down
11221122
DELETE FROM ft2
11231123
USING ft4 LEFT JOIN ft5 ON (ft4.c1 = ft5.c1)
11241124
WHERE ft2.c1 > 1200 AND ft2.c1 % 10 = 0 AND ft2.c2 = ft4.c1
@@ -1146,11 +1146,11 @@ EXPLAIN (verbose, costs off)
11461146
DELETE FROM ft2
11471147
USING ft4 INNER JOIN ft5 ON (ft4.c1 === ft5.c1)
11481148
WHERE ft2.c1 > 2000 AND ft2.c2 = ft4.c1
1149-
RETURNING ft2.ctid, ft2.c1, ft2.c2, ft2.c3; -- can't be pushed down
1149+
RETURNING ft2.c1, ft2.c2, ft2.c3; -- can't be pushed down
11501150
DELETE FROM ft2
11511151
USING ft4 INNER JOIN ft5 ON (ft4.c1 === ft5.c1)
11521152
WHERE ft2.c1 > 2000 AND ft2.c2 = ft4.c1
1153-
RETURNING ft2.ctid, ft2.c1, ft2.c2, ft2.c3;
1153+
RETURNING ft2.c1, ft2.c2, ft2.c3;
11541154
DELETE FROM ft2 WHERE ft2.c1 > 2000;
11551155
ALTER SERVER loopback OPTIONS (ADD extensions 'postgres_fdw');
11561156

0 commit comments

Comments
 (0)