diff options
| -rw-r--r-- | src/backend/storage/file/buffile.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c index ac8cd1d8467..6a80d3bba1f 100644 --- a/src/backend/storage/file/buffile.c +++ b/src/backend/storage/file/buffile.c @@ -23,8 +23,10 @@ * will go away automatically at transaction end. If the underlying * virtual File is made with OpenTemporaryFile, then all resources for * the file are certain to be cleaned up even if processing is aborted - * by ereport(ERROR). To avoid confusion, the caller should take care that - * all calls for a single BufFile are made in the same palloc context. + * by ereport(ERROR). The data structures required are made in the + * palloc context that was current when the BufFile was created, and + * any external resources such as temp files are owned by the ResourceOwner + * that was current at that time. * * BufFile also supports temporary files that exceed the OS file size limit * (by opening multiple fd.c temporary files). This is an essential feature @@ -38,6 +40,7 @@ #include "storage/fd.h" #include "storage/buffile.h" #include "storage/buf_internals.h" +#include "utils/resowner.h" /* * We break BufFiles into gigabyte-sized segments, regardless of RELSEG_SIZE. @@ -69,6 +72,13 @@ struct BufFile bool dirty; /* does buffer need to be written? */ /* + * resowner is the ResourceOwner to use for underlying temp files. (We + * don't need to remember the memory context we're using explicitly, + * because after creation we only repalloc our arrays larger.) + */ + ResourceOwner resowner; + + /* * "current pos" is position of start of buffer within the logical file. * Position as seen by user of BufFile is (curFile, curOffset + pos). */ @@ -103,6 +113,7 @@ makeBufFile(File firstfile) file->isTemp = false; file->isInterXact = false; file->dirty = false; + file->resowner = CurrentResourceOwner; file->curFile = 0; file->curOffset = 0L; file->pos = 0; @@ -118,11 +129,18 @@ static void extendBufFile(BufFile *file) { File pfile; + ResourceOwner oldowner; + + /* Be sure to associate the file with the BufFile's resource owner */ + oldowner = CurrentResourceOwner; + CurrentResourceOwner = file->resowner; Assert(file->isTemp); pfile = OpenTemporaryFile(file->isInterXact); Assert(pfile >= 0); + CurrentResourceOwner = oldowner; + file->files = (File *) repalloc(file->files, (file->numFiles + 1) * sizeof(File)); file->offsets = (off_t *) repalloc(file->offsets, @@ -141,7 +159,8 @@ extendBufFile(BufFile *file) * at end of transaction. * * Note: if interXact is true, the caller had better be calling us in a - * memory context that will survive across transaction boundaries. + * memory context, and with a resource owner, that will survive across + * transaction boundaries. */ BufFile * BufFileCreateTemp(bool interXact) |