remove_bogus_Assert_from_BufFileSize_v2.patch
application/octet-stream
Filename: remove_bogus_Assert_from_BufFileSize_v2.patch
Type: application/octet-stream
Part: 0
Patch
Format: unified
Series: patch v2
| File | + | − |
|---|---|---|
| src/backend/storage/file/buffile.c | 3 | 8 |
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");