NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitbde39ee

committed

Fix a couple of bugs in recent parallelism-related commits.

Commit816e336 added the wrong errorcheck to async.c; sending restrictions is restricted to the leader,not altogether unsafe.Commit3bd909b added ExecShutdownNodeto traverse the planstate tree and call shutdown functions, but madea Gather node, the only node that actually has such a function, abortthe tree traversal, which is wrong.

1 parent1a219fa commitbde39eeCopy full SHA for bde39ee

File tree

2 files changed

-6

lines changed

src/backend
- commands
  - async.c
- executor
  - execProcnode.c

2 files changed

-6

lines changed

`‎src/backend/commands/async.c`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@`
`117`	`117`	`#include<unistd.h>`
`118`	`118`	`#include<signal.h>`
`119`	`119`
	`120`	`+#include"access/parallel.h"`
`120`	`121`	`#include"access/slru.h"`
`121`	`122`	`#include"access/transam.h"`
`122`	`123`	`#include"access/xact.h"`
`@@ -544,8 +545,8 @@ Async_Notify(const char channel, const char payload)`
`544`	`545`	`Notification*n;`
`545`	`546`	`MemoryContextoldcontext;`
`546`	`547`
`547`		`-if (IsInParallelMode())`
`548`		`-elog(ERROR,"cannot send notificationsduring a paralleloperation");`
	`548`	`+if (IsParallelWorker())`
	`549`	`+elog(ERROR,"cannot send notificationsfrom a parallelworker");`
`549`	`550`
`550`	`551`	`if (Trace_notify)`
`551`	`552`	`elog(DEBUG1,"Async_Notify(%s)",channel);`

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

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -804,10 +804,7 @@ ExecShutdownNode(PlanState *node)`
`804`	`804`	`switch (nodeTag(node))`
`805`	`805`	`{`
`806`	`806`	`caseT_GatherState:`
`807`		`-{`
`808`		`-ExecShutdownGather((GatherState*)node);`
`809`		`-return true;`
`810`		`-}`
	`807`	`+ExecShutdownGather((GatherState*)node);`
`811`	`808`	`break;`
`812`	`809`	`default:`
`813`	`810`	`break;`

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!

Commitbde39ee

File tree

2 files changed

2 files changed

`‎src/backend/commands/async.c`

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

0 commit comments