database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Remove FileUnlink(), which wasn't being used anywhere and interacted poorly

Browse Source 
with the recent patch to log temp file sizes at removal time.  Doesn't seem
worth fixing since it's unused.
In passing, make a few elog messages conform to the message style guide.
This commit is contained in:
Tom Lane
2007-07-26 15:15:18 +00:00
parent 82eed4dba2
commit e4f4a7f5a4
2 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/backend/storage/file/fd.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.139 2007/06/07 19:19:57 tgl Exp $
* $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.140 2007/07/26 15:15:18 tgl Exp $
*
* NOTES:
*
@ -549,8 +549,7 @@ LruDelete(File file)
/* close the file */
if (close(vfdP->fd))
elog(ERROR, "failed to close \"%s\": %m",
vfdP->fileName);
elog(ERROR, "could not close file \"%s\": %m", vfdP->fileName);
--nfile;
vfdP->fd = VFD_CLOSED;
@ -985,8 +984,7 @@ FileClose(File file)
/* close the file */
if (close(vfdP->fd))
elog(ERROR, "failed to close \"%s\": %m",
vfdP->fileName);
elog(ERROR, "could not close file \"%s\": %m", vfdP->fileName);
--nfile;
vfdP->fd = VFD_CLOSED;
@ -1005,15 +1003,15 @@ FileClose(File file)
{
if (filestats.st_size >= log_temp_files)
ereport(LOG,
(errmsg("temp file: path \"%s\" size %lu",
vfdP->fileName, (unsigned long)filestats.st_size)));
(errmsg("temp file: path \"%s\" size %lu",
vfdP->fileName,
(unsigned long) filestats.st_size)));
}
else
elog(LOG, "Could not stat \"%s\": %m", vfdP->fileName);
elog(LOG, "could not stat file \"%s\": %m", vfdP->fileName);
}
if (unlink(vfdP->fileName))
elog(LOG, "failed to unlink \"%s\": %m",
vfdP->fileName);
elog(LOG, "could not unlink file \"%s\": %m", vfdP->fileName);
}
/*
@ -1022,23 +1020,6 @@ FileClose(File file)
FreeVfd(file);
}
/*
* close a file and forcibly delete the underlying Unix file
*/
void
FileUnlink(File file)
{
Assert(FileIsValid(file));
DO_DB(elog(LOG, "FileUnlink: %d (%s)",
file, VfdCache[file].fileName));
/* force FileClose to delete it */
VfdCache[file].fdstate |= FD_TEMPORARY;
FileClose(file);
}
int
FileRead(File file, char *buffer, int amount)
{