NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7702d7a

committed

target list fixes.

1 parent1d00134 commit7702d7aCopy full SHA for 7702d7a

File tree

3 files changed

-29

lines changed

src
- backend/optimizer
  - plan
    - planner.c
  - util
    - tlist.c
- include/optimizer
  - tlist.h

3 files changed

-29

lines changed

`‎src/backend/optimizer/plan/planner.c`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.28 1998/07/19 05:49:14 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.29 1998/07/20 21:18:32 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -446,7 +446,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)`
`446`	`446`
`447`	`447`	`if (typeTypeRelid(typ)==InvalidOid)`
`448`	`448`	`{`
`449`		`-if (exec_tlist_length(tlist)>1)`
	`449`	`+if (ExecTargetListLength(tlist)>1)`
`450`	`450`	`elog(ERROR,"function declared to return %s returns multiple values in final retrieve",typeTypeName(typ));`
`451`	`451`
`452`	`452`	`resnode= (Resdom) ((TargetEntry)lfirst(tlist))->resdom;`
`@@ -464,7 +464,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)`
`464`	`464`	`* is 'retrieve (x = func2())', where func2 has the same return type`
`465`	`465`	`* as the function that's calling it.`
`466`	`466`	`*/`
`467`		`-if (exec_tlist_length(tlist)==1)`
	`467`	`+if (ExecTargetListLength(tlist)==1)`
`468`	`468`	`{`
`469`	`469`	`resnode= (Resdom) ((TargetEntry)lfirst(tlist))->resdom;`
`470`	`470`	`if (resnode->restype==rettype)`
`@@ -485,7 +485,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)`
`485`	`485`	`relid=reln->rd_id;`
`486`	`486`	`relnatts=reln->rd_rel->relnatts;`
`487`	`487`
`488`		`-if (exec_tlist_length(tlist)!=relnatts)`
	`488`	`+if (ExecTargetListLength(tlist)!=relnatts)`
`489`	`489`	`elog(ERROR,"function declared to return type %s does not retrieve (%s.*)",typeTypeName(typ),typeTypeName(typ));`
`490`	`490`
`491`	`491`	`/* expect attributes 1 .. n in order */`

`‎src/backend/optimizer/util/tlist.c`

Lines changed: 1 addition & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.15 1998/07/2019:53:48 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.16 1998/07/2021:18:34 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -589,23 +589,3 @@ AddGroupAttrToTlist(List tlist, List grpCl)`
`589`	`589`	`}`
`590`	`590`
`591`	`591`	`#endif`
`592`		`-`
`593`		`-/* was ExecTargetListLength() in execQual.c,`
`594`		`- moved here to reduce dependencies on the executor module */`
`595`		`-int`
`596`		`-exec_tlist_length(List*targetlist)`
`597`		`-{`
`598`		`-intlen;`
`599`		`-List*tl;`
`600`		`-TargetEntry*curTle;`
`601`		`-`
`602`		`-len=0;`
`603`		`-foreach(tl,targetlist)`
`604`		`-{`
`605`		`-curTle=lfirst(tl);`
`606`		`-`
`607`		`-if (curTle->resdom!=NULL)`
`608`		`-len++;`
`609`		`-}`
`610`		`-returnlen;`
`611`		`-}`

`‎src/include/optimizer/tlist.h`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: tlist.h,v 1.11 1998/07/2020:48:54 momjian Exp $`
	`9`	`+ * $Id: tlist.h,v 1.12 1998/07/2021:18:35 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -17,7 +17,6 @@`
`17`	`17`	`#include"nodes/parsenodes.h"`
`18`	`18`	`#include"nodes/relation.h"`
`19`	`19`
`20`		`-externintexec_tlist_length(List*targelist);`
`21`	`20`	`externTargetEntrytlistentry_member(Varvar,List*targetlist);`
`22`	`21`	`externExprmatching_tlvar(Varvar,List*targetlist);`
`23`	`22`	`externvoidadd_tl_element(RelOptInforel,Varvar);`
`@@ -30,8 +29,7 @@ extern TargetEntry match_varid(Var test_var, List *tlist);`
`30`	`29`	`externListnew_unsorted_tlist(Listtargetlist);`
`31`	`30`	`externListcopy_vars(Listtarget,List*source);`
`32`	`31`	`externListflatten_tlist(Listtlist);`
`33`		`-externList*`
`34`		`-flatten_tlist_vars(List*full_tlist,`
	`32`	`+externListflatten_tlist_vars(Listfull_tlist,`
`35`	`33`	`List*flat_tlist);`
`36`	`34`
`37`	`35`	`#endif/* TLIST_H */`

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!

Commit7702d7a

File tree

3 files changed

3 files changed

`‎src/backend/optimizer/plan/planner.c`

`‎src/backend/optimizer/util/tlist.c`

`‎src/include/optimizer/tlist.h`

0 commit comments