From 1dd647d53d38aaabcd4cef0ece4e556297d69729 Mon Sep 17 00:00:00 2001 From: David Rowley Date: Wed, 3 Jul 2024 18:07:58 +1200 Subject: [PATCH v3 1/3] Remove incorrect Asserts in buffile.c Both BufFileSize() and BufFileAppend() contained Asserts to ensure the given BufFile(s) had a valid fileset. A valid fileset isn't required in either of these functions, so remove the Asserts. Discussion: https://postgr.es/m/CAApHDvofgZT0VzydhyGH5MMb-XZzNDqqAbzf1eBZV5HDm3%2BosQ%40mail.gmail.com --- src/backend/storage/file/buffile.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c index a263875fd5..5535e81214 100644 --- a/src/backend/storage/file/buffile.c +++ b/src/backend/storage/file/buffile.c @@ -857,9 +857,9 @@ BufFileSeekBlock(BufFile *file, int64 blknum) } /* - * Return the current fileset based BufFile size. + * Returns the size if the given BufFile in bytes. * - * Counts any holes left behind by BufFileAppend as part of the size. + * Returned value includes the size of any holes left behind by BufFileAppend. * ereport()s on failure. */ int64 @@ -867,8 +867,6 @@ BufFileSize(BufFile *file) { int64 lastFileSize; - Assert(file->fileset != NULL); - /* Get the size of the last physical file. */ lastFileSize = FileSize(file->files[file->numFiles - 1]); if (lastFileSize < 0) @@ -883,8 +881,7 @@ BufFileSize(BufFile *file) } /* - * Append the contents of source file (managed within fileset) to - * end of target file (managed within same fileset). + * Append the contents of source file to end of target file. * * Note that operation subsumes ownership of underlying resources from * "source". Caller should never call BufFileClose against source having @@ -908,10 +905,8 @@ BufFileAppend(BufFile *target, BufFile *source) int newNumFiles = target->numFiles + source->numFiles; int i; - Assert(target->fileset != NULL); Assert(source->readOnly); Assert(!source->dirty); - Assert(source->fileset != NULL); if (target->resowner != source->resowner) elog(ERROR, "could not append BufFile with non-matching resource owner"); -- 2.34.1