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

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.

diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index d6d6070cc7f961c7f057f34b91169ae2014ab2be..8f99511993832fedf2e61b214b78a7a7e6a6bd5b 100644 (file)
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -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)
 {

diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index c0333010533a58d35ba0ab95d65c3debba328809..e5c7b601f8802e128a3559ac11e881bc1f7b479f 100644 (file)
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -62,7 +62,6 @@ extern int    max_files_per_process;
 extern File PathNameOpenFile(FileName fileName, int fileFlags, int fileMode);
 extern File OpenTemporaryFile(bool interXact);
 extern void FileClose(File file);
-extern void FileUnlink(File file);
 extern int     FileRead(File file, char *buffer, int amount);
 extern int     FileWrite(File file, char *buffer, int amount);
 extern int     FileSync(File file);