NotificationsYou must be signed in to change notification settings
Fork2
Star4

Commit68edd02

committed

Fix for8766f08: Use xact callback instead of the hook, it allowes to clean up after rollback

1 parent61ea0bd commit68edd02Copy full SHA for 68edd02

File tree

1 file changed

-27

lines changed

pg_variables.c

1 file changed

-27

lines changed

`‎pg_variables.c`

Lines changed: 8 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,6 @@ static void makePackHTAB(Package *package, bool is_trans);`
`80`	`80`	`staticinlineChangedObjectmakeChangedObject(TransObjectobject,`
`81`	`81`	`MemoryContextctx);`
`82`	`82`
`83`		`-/* Hook functions */`
`84`		`-staticvoidvariable_ExecutorEnd(QueryDesc*queryDesc);`
`85`		`-`
`86`	`83`	`#defineCHECK_ARGS_FOR_NULL() \`
`87`	`84`	`do { \`
`88`	`85`	`if (fcinfo->argnull[0]) \`
`@@ -113,9 +110,6 @@ static Oid LastTypeId = InvalidOid;`
`113`	`110`	`*/`
`114`	`111`	`staticHASH_SEQ_STATUS*LastHSeqStatus=NULL;`
`115`	`112`
`116`		`-/* Saved hook values for recall */`
`117`		`-staticExecutorEnd_hook_typeprev_ExecutorEnd=NULL;`
`118`		`-`
`119`	`113`	`/* This stack contains lists of changed variables and packages per each subxact level */`
`120`	`114`	`staticdlist_head*changesStack=NULL;`
`121`	`115`	`staticMemoryContextchangesStackContext=NULL;`
`@@ -2120,23 +2114,15 @@ pgvTransCallback(XactEvent event, void *arg)`
`2120`	`2114`	`break;`
`2121`	`2115`	`}`
`2122`	`2116`	`}`
`2123`		`-}`
`2124`	`2117`
`2125`		`-/*`
`2126`		`- * ExecutorEnd hook: clean up hash table sequential scan status`
`2127`		`- */`
`2128`		`-staticvoid`
`2129`		`-variable_ExecutorEnd(QueryDesc*queryDesc)`
`2130`		`-{`
`2131`		`-if (LastHSeqStatus)`
`2132`		`-{`
`2133`		`-hash_seq_term(LastHSeqStatus);`
`2134`		`-LastHSeqStatus=NULL;`
`2135`		`-}`
`2136`		`-if (prev_ExecutorEnd)`
`2137`		`-prev_ExecutorEnd(queryDesc);`
`2138`		`-else`
`2139`		`-standard_ExecutorEnd(queryDesc);`
	`2118`	`+if (event==XACT_EVENT_PARALLEL_COMMIT\|\|event==XACT_EVENT_COMMIT\|\|`
	`2119`	`+event==XACT_EVENT_PREPARE\|\|`
	`2120`	`+event==XACT_EVENT_PARALLEL_ABORT\|\|event==XACT_EVENT_ABORT)`
	`2121`	`+if (LastHSeqStatus)`
	`2122`	`+{`
	`2123`	`+hash_seq_term(LastHSeqStatus);`
	`2124`	`+LastHSeqStatus=NULL;`
	`2125`	`+}`
`2140`	`2126`	`}`
`2141`	`2127`
`2142`	`2128`	`/*`
`@@ -2147,10 +2133,6 @@ _PG_init(void)`
`2147`	`2133`	`{`
`2148`	`2134`	`RegisterXactCallback(pgvTransCallback,NULL);`
`2149`	`2135`	`RegisterSubXactCallback(pgvSubTransCallback,NULL);`
`2150`		`-`
`2151`		`-/* Install hooks. */`
`2152`		`-prev_ExecutorEnd=ExecutorEnd_hook;`
`2153`		`-ExecutorEnd_hook=variable_ExecutorEnd;`
`2154`	`2136`	`}`
`2155`	`2137`
`2156`	`2138`	`/*`
`@@ -2161,5 +2143,4 @@ _PG_fini(void)`
`2161`	`2143`	`{`
`2162`	`2144`	`UnregisterXactCallback(pgvTransCallback,NULL);`
`2163`	`2145`	`UnregisterSubXactCallback(pgvSubTransCallback,NULL);`
`2164`		`-ExecutorEnd_hook=prev_ExecutorEnd;`
`2165`	`2146`	`}`

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!

Commit68edd02

File tree

1 file changed

1 file changed

`‎pg_variables.c`

0 commit comments