From f95ad555de5623588bcc6e48fe8a3fd50d721216 Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Sat, 6 Aug 2022 12:02:43 +1200 Subject: Replace pgwin32_is_junction() with lstat(). Now that lstat() reports junction points with S_IFLNK/S_ISLINK(), and unlink() can unlink them, there is no need for conditional code for Windows in a few places. That was expressed by testing for WIN32 or S_ISLNK, which we can now constant-fold. The coding around pgwin32_is_junction() was a bit suspect anyway, as we never checked for errors, and we also know that errors can be spuriously reported because of transient sharing violations on this OS. The lstat()-based code has handling for that. This also reverts 4fc6b6ee on master only. That was done because lstat() didn't previously work for symlinks (junction points), but now it does. Tested-by: Andrew Dunstan Discussion: https://postgr.es/m/CA%2BhUKGLfOOeyZpm5ByVcAt7x5Pn-%3DxGRNCvgiUPVVzjFLtnY0w%40mail.gmail.com (cherry picked from commit 5fc88c5d53e43fa7dcea93499d230a0bf70f4f77) Author: Thomas Munro Author: Alexandra Wang --- src/backend/commands/tablespace.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/backend/commands/tablespace.c') diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 9bdfef97bb9..977df7498bd 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -807,8 +807,7 @@ destroy_tablespace_directories(Oid tablespaceoid, bool redo) /* * Try to remove the symlink. We must however deal with the possibility * that it's a directory instead of a symlink --- this could happen during - * WAL replay (see TablespaceCreateDbspace), and it is also the case on - * Windows where junction points lstat() as directories. + * WAL replay (see TablespaceCreateDbspace). * * Note: in the redo case, we'll return true if this final step fails; * there's no point in retrying it. Also, ENOENT should provoke no more @@ -838,7 +837,6 @@ remove_symlink: linkloc))); } } -#ifdef S_ISLNK else if (S_ISLNK(st.st_mode)) { if (unlink(linkloc) < 0) @@ -851,7 +849,6 @@ remove_symlink: linkloc))); } } -#endif else { /* Refuse to remove anything that's not a directory or symlink */ @@ -929,7 +926,6 @@ remove_tablespace_symlink(const char *linkloc) errmsg("could not remove directory \"%s\": %m", linkloc))); } -#ifdef S_ISLNK else if (S_ISLNK(st.st_mode)) { if (unlink(linkloc) < 0 && errno != ENOENT) @@ -938,7 +934,6 @@ remove_tablespace_symlink(const char *linkloc) errmsg("could not remove symbolic link \"%s\": %m", linkloc))); } -#endif else { /* Refuse to remove anything that's not a directory or symlink */ -- cgit v1.2.3