NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit6da378d

committed

Fix whole-row references in postgres_fdw.

The optimization to not retrieve unnecessary columns wasn't smart enough.Noted by Thom Brown.

1 parent211e157 commit6da378dCopy full SHA for 6da378d

File tree

3 files changed

+39

-1

lines changed

contrib/postgres_fdw
- deparse.c
- expected
  - postgres_fdw.out
- sql
  - postgres_fdw.sql

3 files changed

+39

-1

lines changed

`‎contrib/postgres_fdw/deparse.c`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -364,6 +364,7 @@ deparseSimpleSql(StringInfo buf,`
`364`	`364`	`{`
`365`	`365`	`RangeTblEntry*rte=root->simple_rte_array[baserel->relid];`
`366`	`366`	`Bitmapset*attrs_used=NULL;`
	`367`	`+boolhave_wholerow;`
`367`	`368`	`boolfirst;`
`368`	`369`	`AttrNumberattr;`
`369`	`370`	`ListCell*lc;`
`@@ -381,6 +382,10 @@ deparseSimpleSql(StringInfo buf,`
`381`	`382`	`&attrs_used);`
`382`	`383`	`}`
`383`	`384`
	`385`	`+/* If there's a whole-row reference, we'll need all the columns. */`
	`386`	`+have_wholerow=bms_is_member(0-FirstLowInvalidHeapAttributeNumber,`
	`387`	`+attrs_used);`
	`388`	`+`
`384`	`389`	`/*`
`385`	`390`	`* Construct SELECT list`
`386`	`391`	`*`
`@@ -401,7 +406,8 @@ deparseSimpleSql(StringInfo buf,`
`401`	`406`	`appendStringInfo(buf,", ");`
`402`	`407`	`first= false;`
`403`	`408`
`404`		`-if (bms_is_member(attr-FirstLowInvalidHeapAttributeNumber,`
	`409`	`+if (have_wholerow\|\|`
	`410`	`+bms_is_member(attr-FirstLowInvalidHeapAttributeNumber,`
`405`	`411`	`attrs_used))`
`406`	`412`	`deparseColumnRef(buf,baserel->relid,attr,root);`
`407`	`413`	`else`

`‎contrib/postgres_fdw/expected/postgres_fdw.out`

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,35 @@ SELECT * FROM ft1 t1 ORDER BY t1.c3, t1.c1 OFFSET 100 LIMIT 10;`
`180`	`180`	`110 \| 0 \| 00110 \| Sun Jan 11 00:00:00 1970 PST \| Sun Jan 11 00:00:00 1970 \| 0 \| 0 \| foo`
`181`	`181`	`(10 rows)`
`182`	`182`
	`183`	`+-- whole-row reference`
	`184`	`+EXPLAIN (VERBOSE, COSTS false) SELECT t1 FROM ft1 t1 ORDER BY t1.c3, t1.c1 OFFSET 100 LIMIT 10;`
	`185`	`+ QUERY PLAN`
	`186`	`+-------------------------------------------------------------------------------------`
	`187`	`+ Limit`
	`188`	`+ Output: t1.*, c3, c1`
	`189`	`+ -> Sort`
	`190`	`+ Output: t1.*, c3, c1`
	`191`	`+ Sort Key: t1.c3, t1.c1`
	`192`	`+ -> Foreign Scan on public.ft1 t1`
	`193`	`+ Output: t1.*, c3, c1`
	`194`	`+ Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1"`
	`195`	`+(8 rows)`
	`196`	`+`
	`197`	`+SELECT t1 FROM ft1 t1 ORDER BY t1.c3, t1.c1 OFFSET 100 LIMIT 10;`
	`198`	`+ t1`
	`199`	`+--------------------------------------------------------------------------------------------`
	`200`	`+ (101,1,00101,"Fri Jan 02 00:00:00 1970 PST","Fri Jan 02 00:00:00 1970",1,"1 ",foo)`
	`201`	`+ (102,2,00102,"Sat Jan 03 00:00:00 1970 PST","Sat Jan 03 00:00:00 1970",2,"2 ",foo)`
	`202`	`+ (103,3,00103,"Sun Jan 04 00:00:00 1970 PST","Sun Jan 04 00:00:00 1970",3,"3 ",foo)`
	`203`	`+ (104,4,00104,"Mon Jan 05 00:00:00 1970 PST","Mon Jan 05 00:00:00 1970",4,"4 ",foo)`
	`204`	`+ (105,5,00105,"Tue Jan 06 00:00:00 1970 PST","Tue Jan 06 00:00:00 1970",5,"5 ",foo)`
	`205`	`+ (106,6,00106,"Wed Jan 07 00:00:00 1970 PST","Wed Jan 07 00:00:00 1970",6,"6 ",foo)`
	`206`	`+ (107,7,00107,"Thu Jan 08 00:00:00 1970 PST","Thu Jan 08 00:00:00 1970",7,"7 ",foo)`
	`207`	`+ (108,8,00108,"Fri Jan 09 00:00:00 1970 PST","Fri Jan 09 00:00:00 1970",8,"8 ",foo)`
	`208`	`+ (109,9,00109,"Sat Jan 10 00:00:00 1970 PST","Sat Jan 10 00:00:00 1970",9,"9 ",foo)`
	`209`	`+ (110,0,00110,"Sun Jan 11 00:00:00 1970 PST","Sun Jan 11 00:00:00 1970",0,"0 ",foo)`
	`210`	`+(10 rows)`
	`211`	`+`
`183`	`212`	`-- empty result`
`184`	`213`	`SELECT * FROM ft1 WHERE false;`
`185`	`214`	`c1 \| c2 \| c3 \| c4 \| c5 \| c6 \| c7 \| c8`

`‎contrib/postgres_fdw/sql/postgres_fdw.sql`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,9 @@ EXPLAIN (COSTS false) SELECT * FROM ft1 ORDER BY c3, c1 OFFSET 100 LIMIT 10;`
`136`	`136`	`SELECT*FROM ft1ORDER BY c3, c1 OFFSET100LIMIT10;`
`137`	`137`	`EXPLAIN (VERBOSE, COSTS false)SELECT*FROM ft1 t1ORDER BYt1.c3,t1.c1 OFFSET100LIMIT10;`
`138`	`138`	`SELECT*FROM ft1 t1ORDER BYt1.c3,t1.c1 OFFSET100LIMIT10;`
	`139`	`+-- whole-row reference`
	`140`	`+EXPLAIN (VERBOSE, COSTS false)SELECT t1FROM ft1 t1ORDER BYt1.c3,t1.c1 OFFSET100LIMIT10;`
	`141`	`+SELECT t1FROM ft1 t1ORDER BYt1.c3,t1.c1 OFFSET100LIMIT10;`
`139`	`142`	`-- empty result`
`140`	`143`	`SELECT*FROM ft1WHERE false;`
`141`	`144`	`-- with WHERE clause`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6da378d

File tree

3 files changed

3 files changed

`‎contrib/postgres_fdw/deparse.c`

`‎contrib/postgres_fdw/expected/postgres_fdw.out`

`‎contrib/postgres_fdw/sql/postgres_fdw.sql`

0 commit comments