NotificationsYou must be signed in to change notification settings
Fork54
Star463

Commit80bcf2d

committed

Bugfix. Choose memory context for a query environment piece in more safe way.

Sometimes someone can invent a queryEnv and use it with short-lived plans. So,anyone under the hood should create its queryEnv in the same memory context.

1 parenta33461d commit80bcf2dCopy full SHA for 80bcf2d

File tree

1 file changed

+26

-8

lines changed

postprocessing.c

1 file changed

+26

-8

lines changed

`‎postprocessing.c`

Lines changed: 26 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -913,11 +913,20 @@ StoreToQueryEnv(QueryDesc *queryDesc)`
`913`	`913`	`MemoryContextoldCxt;`
`914`	`914`	`boolnewentry= false;`
`915`	`915`
`916`		`-oldCxt=MemoryContextSwitchTo(GetMemoryChunkContext(queryDesc->plannedstmt));`
`917`		`-`
`918`		`-if (queryDesc->queryEnv==NULL)`
`919`		`-queryDesc->queryEnv=create_queryEnv();`
	`916`	`+/*`
	`917`	`+ * Choose memory context for AQO parameters. Use pre-existed context if`
	`918`	`+ * someone earlier created queryEnv (usually, SPI), or base on the queryDesc`
	`919`	`+ * memory context.`
	`920`	`+ */`
	`921`	`+if (queryDesc->queryEnv!=NULL)`
	`922`	`+oldCxt=MemoryContextSwitchTo(GetMemoryChunkContext(queryDesc->queryEnv));`
	`923`	`+else`
	`924`	`+{`
	`925`	`+oldCxt=MemoryContextSwitchTo(GetMemoryChunkContext(queryDesc));`
	`926`	`+queryDesc->queryEnv=create_queryEnv();`
	`927`	`+}`
`920`	`928`
	`929`	`+Assert(queryDesc->queryEnv);`
`921`	`930`	`enr=get_ENR(queryDesc->queryEnv,AQOPrivateData);`
`922`	`931`	`if (enr==NULL)`
`923`	`932`	`{`
`@@ -965,11 +974,20 @@ StorePlanInternals(QueryDesc *queryDesc)`
`965`	`974`	`njoins=0;`
`966`	`975`	`planstate_tree_walker(queryDesc->planstate,calculateJoinNum,&njoins);`
`967`	`976`
`968`		`-oldCxt=MemoryContextSwitchTo(GetMemoryChunkContext(queryDesc->plannedstmt));`
`969`		`-`
`970`		`-if (queryDesc->queryEnv==NULL)`
`971`		`-queryDesc->queryEnv=create_queryEnv();`
	`977`	`+/*`
	`978`	`+ * Choose memory context for AQO parameters. Use pre-existed context if`
	`979`	`+ * someone earlier created queryEnv (usually, SPI), or base on the queryDesc`
	`980`	`+ * memory context.`
	`981`	`+ */`
	`982`	`+if (queryDesc->queryEnv!=NULL)`
	`983`	`+oldCxt=MemoryContextSwitchTo(GetMemoryChunkContext(queryDesc->queryEnv));`
	`984`	`+else`
	`985`	`+{`
	`986`	`+oldCxt=MemoryContextSwitchTo(GetMemoryChunkContext(queryDesc));`
	`987`	`+queryDesc->queryEnv=create_queryEnv();`
	`988`	`+}`
`972`	`989`
	`990`	`+Assert(queryDesc->queryEnv);`
`973`	`991`	`enr=get_ENR(queryDesc->queryEnv,PlanStateInfo);`
`974`	`992`	`if (enr==NULL)`
`975`	`993`	`{`

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!

Commit80bcf2d

File tree

1 file changed

1 file changed

`‎postprocessing.c`

0 commit comments