NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit3a45321

Etsuro Fujita

committed

Fix thinko in ExecCleanupTupleRouting().

Commit3f2393e changed ExecCleanupTupleRouting() so that it skippedcleaning up subplan resultrels before calling EndForeignInsert(), butthat would cause an issue: when those resultrels were foreign tables,the FDWs would fail to shut down. Repair by skipping it after callingEndForeignInsert() as before.Author: Etsuro FujitaReviewed-by: David Rowley and Amit LangoteDiscussion:https://postgr.es/m/5CAF3B8F.2090905@lab.ntt.co.jp

1 parentabb9c63 commit3a45321Copy full SHA for 3a45321

File tree

1 file changed

-6

lines changed

src/backend/executor
- execPartition.c

1 file changed

-6

lines changed

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

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1126,6 +1126,12 @@ ExecCleanupTupleRouting(ModifyTableState *mtstate,`
`1126`	`1126`	`{`
`1127`	`1127`	`ResultRelInfo*resultRelInfo=proute->partitions[i];`
`1128`	`1128`
	`1129`	`+/* Allow any FDWs to shut down */`
	`1130`	`+if (resultRelInfo->ri_FdwRoutine!=NULL&&`
	`1131`	`+resultRelInfo->ri_FdwRoutine->EndForeignInsert!=NULL)`
	`1132`	`+resultRelInfo->ri_FdwRoutine->EndForeignInsert(mtstate->ps.state,`
	`1133`	`+resultRelInfo);`
	`1134`	`+`
`1129`	`1135`	`/*`
`1130`	`1136`	`* Check if this result rel is one belonging to the node's subplans,`
`1131`	`1137`	`* if so, let ExecEndPlan() clean it up.`
`@@ -1142,12 +1148,6 @@ ExecCleanupTupleRouting(ModifyTableState *mtstate,`
`1142`	`1148`	`continue;`
`1143`	`1149`	`}`
`1144`	`1150`
`1145`		`-/* Allow any FDWs to shut down if they've been exercised */`
`1146`		`-if (resultRelInfo->ri_FdwRoutine!=NULL&&`
`1147`		`-resultRelInfo->ri_FdwRoutine->EndForeignInsert!=NULL)`
`1148`		`-resultRelInfo->ri_FdwRoutine->EndForeignInsert(mtstate->ps.state,`
`1149`		`-resultRelInfo);`
`1150`		`-`
`1151`	`1151`	`ExecCloseIndices(resultRelInfo);`
`1152`	`1152`	`table_close(resultRelInfo->ri_RelationDesc,NoLock);`
`1153`	`1153`	`}`

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!

Commit3a45321

File tree

1 file changed

1 file changed

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

0 commit comments