NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit81f2e51

committed

Fix query cancellation.

In commitfe0a0b5, the datatype used for MyCancelKey and other variablesthat store cancel keys were changed from long to uint32, but I missed thisone. That broke query cancellation on platforms where long is wider than 32bits.Report by Andres Freund, fix by Michael Paquier.

1 parent9790b87 commit81f2e51Copy full SHA for 81f2e51

File tree

1 file changed

-2

lines changed

src/backend/postmaster
- postmaster.c

1 file changed

-2

lines changed

`‎src/backend/postmaster/postmaster.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2216,7 +2216,7 @@ processCancelRequest(Port port, void pkt)`
`2216`	`2216`	`{`
`2217`	`2217`	`CancelRequestPacketcanc= (CancelRequestPacket)pkt;`
`2218`	`2218`	`intbackendPID;`
`2219`		`-longcancelAuthCode;`
	`2219`	`+int32cancelAuthCode;`
`2220`	`2220`	`Backend*bp;`
`2221`	`2221`
`2222`	`2222`	`#ifndefEXEC_BACKEND`
`@@ -2226,7 +2226,7 @@ processCancelRequest(Port port, void pkt)`
`2226`	`2226`	`#endif`
`2227`	`2227`
`2228`	`2228`	`backendPID= (int)ntohl(canc->backendPID);`
`2229`		`-cancelAuthCode= (long)ntohl(canc->cancelAuthCode);`
	`2229`	`+cancelAuthCode= (int32)ntohl(canc->cancelAuthCode);`
`2230`	`2230`
`2231`	`2231`	`/*`
`2232`	`2232`	`* See if we have a matching backend. In the EXEC_BACKEND case, we can no`

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!

Commit81f2e51

File tree

1 file changed

1 file changed

`‎src/backend/postmaster/postmaster.c`

0 commit comments