mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust tuplestore.c not to allocate BufFiles in generation context

Browse Source 
590b045c3 made it so tuplestore.c would store tuples inside a
generation.c memory context.  After fixing a bug report in 97651b013, it
seems that it's probably best not to allocate BufFile related
allocations in that context.  Let's keep it just for tuple data.

This adjusts the code to switch to the Tuplestorestate.context's parent,
which is the MemoryContext that tuplestore_begin_common() was called in.
It does not seem worth adding a new field in Tuplestorestate to store
this when we can access it by looking at the Tuplestorestate's
context's parent.

Discussion: https://postgr.es/m/CAApHDvqFt_CdJtSr+E9YLZb7jZAyRCy3hjQ+ktM+dcOFVq-xkg@mail.gmail.com
This commit is contained in:
David Rowley 2024-07-06 17:40:05 +12:00
parent 97651b0139
commit 04bcf9e19a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/utils/sort/tuplestore.c
View File

@ -799,6 +799,7 @@ tuplestore_puttuple_common(Tuplestorestate *state, void *tuple)
TSReadPointer *readptr; TSReadPointer *readptr;
int i; int i;
ResourceOwner oldowner; ResourceOwner oldowner;
MemoryContext oldcxt;
state->tuples++; state->tuples++;
@ -850,8 +851,17 @@ tuplestore_puttuple_common(Tuplestorestate *state, void *tuple)
oldowner = CurrentResourceOwner; oldowner = CurrentResourceOwner;
CurrentResourceOwner = state->resowner; CurrentResourceOwner = state->resowner;
/*
* We switch out of the state->context as this is a generation
* context, which isn't ideal for allocations relating to the
* BufFile.
*/
oldcxt = MemoryContextSwitchTo(state->context->parent);
state->myfile = BufFileCreateTemp(state->interXact); state->myfile = BufFileCreateTemp(state->interXact);
MemoryContextSwitchTo(oldcxt);
CurrentResourceOwner = oldowner; CurrentResourceOwner = oldowner;
/* /*