NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0e06e68

committed

ExecRestrPos() really needs to raise ERROR, not a wimpy DEBUG message,

if given a node type it doesn't support. As is, wrong results from amergejoin would go undetected.

1 parent742cd87 commit0e06e68Copy full SHA for 0e06e68

File tree

1 file changed

+18

-11

lines changed

src/backend/executor
- execAmi.c

1 file changed

+18

-11

lines changed

`‎src/backend/executor/execAmi.c‎`

Lines changed: 18 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- *$Id: execAmi.c,v 1.49 2000/07/12 02:37:00 tgl Exp $`
	`9`	`+ *$Id: execAmi.c,v 1.50 2000/07/25 23:43:38 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -356,7 +356,8 @@ ExecReScan(Plan node, ExprContext exprCtxt, Plan *parent)`
`356`	`356`	`break;`
`357`	`357`
`358`	`358`	`default:`
`359`		`-elog(ERROR,"ExecReScan: node type %u not supported",nodeTag(node));`
	`359`	`+elog(ERROR,"ExecReScan: node type %d not supported",`
	`360`	`+nodeTag(node));`
`360`	`361`	`return;`
`361`	`362`	`}`
`362`	`363`
`@@ -393,7 +394,8 @@ ExecReScanR(Relation relDesc,/* LLL relDesc unused */`
`393`	`394`	`*`
`394`	`395`	`*Marks the current scan position.`
`395`	`396`	`*`
`396`		`- *XXX Needs to be extended to include all the node types.`
	`397`	`+ *XXX Needs to be extended to include all the node types,`
	`398`	`+ *or at least all the ones that can be directly below a mergejoin.`
`397`	`399`	`* ----------------------------------------------------------------`
`398`	`400`	`*/`
`399`	`401`	`void`
`@@ -422,16 +424,20 @@ ExecMarkPos(Plan *node)`
`422`	`424`	`break;`
`423`	`425`
`424`	`426`	`default:`
`425`		`-elog(DEBUG,"ExecMarkPos: node type %u not supported",nodeTag(node));`
	`427`	`+/* don't make hard error unless caller asks to restore... */`
	`428`	`+elog(DEBUG,"ExecMarkPos: node type %d not supported",`
	`429`	`+nodeTag(node));`
`426`	`430`	`break;`
`427`	`431`	`}`
`428`		`-return;`
`429`	`432`	`}`
`430`	`433`
`431`	`434`	`/* ----------------------------------------------------------------`
`432`	`435`	`*ExecRestrPos`
`433`	`436`	`*`
`434`	`437`	`*restores the scan position previously saved with ExecMarkPos()`
	`438`	`+ *`
	`439`	`+ *XXX Needs to be extended to include all the node types,`
	`440`	`+ *or at least all the ones that can be directly below a mergejoin.`
`435`	`441`	`* ----------------------------------------------------------------`
`436`	`442`	`*/`
`437`	`443`	`void`
`@@ -441,22 +447,23 @@ ExecRestrPos(Plan *node)`
`441`	`447`	`{`
`442`	`448`	`caseT_SeqScan:`
`443`	`449`	`ExecSeqRestrPos((SeqScan*)node);`
`444`		`-return;`
	`450`	`+break;`
`445`	`451`
`446`	`452`	`caseT_IndexScan:`
`447`	`453`	`ExecIndexRestrPos((IndexScan*)node);`
`448`		`-return;`
	`454`	`+break;`
`449`	`455`
`450`	`456`	`caseT_Material:`
`451`	`457`	`ExecMaterialRestrPos((Material*)node);`
`452`		`-return;`
	`458`	`+break;`
`453`	`459`
`454`	`460`	`caseT_Sort:`
`455`	`461`	`ExecSortRestrPos((Sort*)node);`
`456`		`-return;`
	`462`	`+break;`
`457`	`463`
`458`	`464`	`default:`
`459`		`-elog(DEBUG,"ExecRestrPos: node type %u not supported",nodeTag(node));`
`460`		`-return;`
	`465`	`+elog(ERROR,"ExecRestrPos: node type %d not supported",`
	`466`	`+nodeTag(node));`
	`467`	`+break;`
`461`	`468`	`}`
`462`	`469`	`}`

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!

Commit0e06e68

File tree

1 file changed

1 file changed

`‎src/backend/executor/execAmi.c‎`

0 commit comments