NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit1601830

committed

Make ginbuild's funcCtx be independent of its tmpCtx.

Previously the funcCtx was a child of the tmpCtx, but that was brokenby commiteaa5808, which madeMemoryContextReset() delete, not reset, child contexts. The behavior ofhaving a tmpCtx reset also clear the other context seems rather dubiousanyway, so let's just disentangle them. Per report from Erik Rijkers.In passing, fix badly-inaccurate comments about these contexts.

1 parent9a8e233 commit1601830Copy full SHA for 1601830

File tree

1 file changed

-3

lines changed

src/backend/access/gin
- gininsert.c

1 file changed

-3

lines changed

`‎src/backend/access/gin/gininsert.c`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -370,16 +370,20 @@ ginbuild(PG_FUNCTION_ARGS)`
`370`	`370`	`buildstate.buildStats.nEntryPages++;`
`371`	`371`
`372`	`372`	`/*`
`373`		`- * create a temporary memory context that isreset once for each tuple`
`374`		`- *inserted into the index`
	`373`	`+ * create a temporary memory context that isused to hold data not yet`
	`374`	`+ *dumped out to the index`
`375`	`375`	`*/`
`376`	`376`	`buildstate.tmpCtx=AllocSetContextCreate(CurrentMemoryContext,`
`377`	`377`	`"Gin build temporary context",`
`378`	`378`	`ALLOCSET_DEFAULT_MINSIZE,`
`379`	`379`	`ALLOCSET_DEFAULT_INITSIZE,`
`380`	`380`	`ALLOCSET_DEFAULT_MAXSIZE);`
`381`	`381`
`382`		`-buildstate.funcCtx=AllocSetContextCreate(buildstate.tmpCtx,`
	`382`	`+/*`
	`383`	`+ * create a temporary memory context that is used for calling`
	`384`	`+ * ginExtractEntries(), and can be reset after each tuple`
	`385`	`+ */`
	`386`	`+buildstate.funcCtx=AllocSetContextCreate(CurrentMemoryContext,`
`383`	`387`	`"Gin build temporary context for user-defined function",`
`384`	`388`	`ALLOCSET_DEFAULT_MINSIZE,`
`385`	`389`	`ALLOCSET_DEFAULT_INITSIZE,`
`@@ -408,6 +412,7 @@ ginbuild(PG_FUNCTION_ARGS)`
`408`	`412`	`}`
`409`	`413`	`MemoryContextSwitchTo(oldCtx);`
`410`	`414`
	`415`	`+MemoryContextDelete(buildstate.funcCtx);`
`411`	`416`	`MemoryContextDelete(buildstate.tmpCtx);`
`412`	`417`
`413`	`418`	`/*`

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!

Commit1601830

File tree

1 file changed

1 file changed

`‎src/backend/access/gin/gininsert.c`

0 commit comments