diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/sort/logtape.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/sort/sharedtuplestore.c | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/backend/utils/sort/logtape.c b/src/backend/utils/sort/logtape.c index cafc0872549..f7994d771d6 100644 --- a/src/backend/utils/sort/logtape.c +++ b/src/backend/utils/sort/logtape.c @@ -564,7 +564,7 @@ ltsConcatWorkerTapes(LogicalTapeSet *lts, TapeShare *shared, lt = <s->tapes[i]; pg_itoa(i, filename); - file = BufFileOpenShared(fileset, filename, O_RDONLY); + file = BufFileOpenFileSet(&fileset->fs, filename, O_RDONLY); filesize = BufFileSize(file); /* @@ -610,7 +610,7 @@ ltsConcatWorkerTapes(LogicalTapeSet *lts, TapeShare *shared, * offset). * * The only thing that currently prevents writing to the leader tape from - * working is the fact that BufFiles opened using BufFileOpenShared() are + * working is the fact that BufFiles opened using BufFileOpenFileSet() are * read-only by definition, but that could be changed if it seemed * worthwhile. For now, writing to the leader tape will raise a "Bad file * descriptor" error, so tuplesort must avoid writing to the leader tape @@ -722,7 +722,7 @@ LogicalTapeSetCreate(int ntapes, bool preallocate, TapeShare *shared, char filename[MAXPGPATH]; pg_itoa(worker, filename); - lts->pfile = BufFileCreateShared(fileset, filename); + lts->pfile = BufFileCreateFileSet(&fileset->fs, filename); } else lts->pfile = BufFileCreateTemp(false); @@ -1096,7 +1096,7 @@ LogicalTapeFreeze(LogicalTapeSet *lts, int tapenum, TapeShare *share) /* Handle extra steps when caller is to share its tapeset */ if (share) { - BufFileExportShared(lts->pfile); + BufFileExportFileSet(lts->pfile); share->firstblocknumber = lt->firstBlockNumber; } } diff --git a/src/backend/utils/sort/sharedtuplestore.c b/src/backend/utils/sort/sharedtuplestore.c index 57e35db4f8d..504ef1c2869 100644 --- a/src/backend/utils/sort/sharedtuplestore.c +++ b/src/backend/utils/sort/sharedtuplestore.c @@ -310,7 +310,8 @@ sts_puttuple(SharedTuplestoreAccessor *accessor, void *meta_data, /* Create one. Only this backend will write into it. */ sts_filename(name, accessor, accessor->participant); - accessor->write_file = BufFileCreateShared(accessor->fileset, name); + accessor->write_file = + BufFileCreateFileSet(&accessor->fileset->fs, name); /* Set up the shared state for this backend's file. */ participant = &accessor->sts->participants[accessor->participant]; @@ -559,7 +560,7 @@ sts_parallel_scan_next(SharedTuplestoreAccessor *accessor, void *meta_data) sts_filename(name, accessor, accessor->read_participant); accessor->read_file = - BufFileOpenShared(accessor->fileset, name, O_RDONLY); + BufFileOpenFileSet(&accessor->fileset->fs, name, O_RDONLY); } /* Seek and load the chunk header. */ |