fix file delete on Windows

Author: gsmolk

src/delete.c

@@ -768,7 +768,7 @@ delete_backup_files(pgBackup *backup)
 			elog(INFO, "Progress: (%zd/%zd). Delete file \"%s\"",
 				 i + 1, num_files, full_path);
 
-		pgFileDelete(file, full_path);
+		pgFileDelete(file->mode, full_path);
 	}
 
 	parray_walk(files, pgFileFree);

src/dir.c

@@ -225,9 +225,9 @@ pgFileInit(const char *rel_path)
  * If the pgFile points directory, the directory must be empty.
  */
 void
-pgFileDelete(pgFile *file, const char *full_path)
+pgFileDelete(mode_t mode, const char *full_path)
 {
-	if (S_ISDIR(file->mode))
+	if (S_ISDIR(mode))
 	{
 		if (rmdir(full_path) == -1)
 		{
@@ -252,38 +252,6 @@ pgFileDelete(pgFile *file, const char *full_path)
 	}
 }
 
-/*
- * Delete file pointed by the pgFile.
- * If the pgFile points directory, the directory must be empty.
- */
-void
-fio_pgFileDelete(pgFile *file, const char *full_path)
-{
-	if (S_ISDIR(file->mode))
-	{
-		if (fio_unlink(full_path, FIO_DB_HOST) == -1)
-		{
-			if (errno == ENOENT)
-				return;
-			else if (errno == ENOTDIR)	/* could be symbolic link */
-				goto delete_file;
-
-			elog(ERROR, "Cannot remove directory \"%s\": %s",
-				full_path, strerror(errno));
-		}
-		return;
-	}
-
-delete_file:
-	if (fio_unlink(full_path, FIO_DB_HOST) == -1)
-	{
-		if (errno == ENOENT)
-			return;
-		elog(ERROR, "Cannot remove file \"%s\": %s", full_path,
-			strerror(errno));
-	}
-}
-
 /*
  * Read the local file to compute its CRC.
  * We cannot make decision about file decompression because

src/merge.c

@@ -806,7 +806,7 @@ merge_chain(parray *parent_chain, pgBackup *full_backup, pgBackup *dest_backup)
 			/* We need full path, file object has relative path */
 			join_path_components(full_file_path, full_database_dir, full_file->rel_path);
 
-			pgFileDelete(full_file, full_file_path);
+			pgFileDelete(full_file->mode, full_file_path);
 			elog(VERBOSE, "Deleted \"%s\"", full_file_path);
 		}
 	}
@@ -1141,7 +1141,7 @@ remove_dir_with_files(const char *path)
 
 		join_path_components(full_path, path, file->rel_path);
 
-		pgFileDelete(file, full_path);
+		pgFileDelete(file->mode, full_path);
 		elog(VERBOSE, "Deleted \"%s\"", full_path);
 	}
 

src/pg_probackup.h

@@ -970,7 +970,7 @@ extern pgFile *pgFileNew(const char *path, const char *rel_path,
 						 bool follow_symlink, int external_dir_num,
 						 fio_location location);
 extern pgFile *pgFileInit(const char *rel_path);
-extern void pgFileDelete(pgFile *file, const char *full_path);
+extern void pgFileDelete(mode_t mode, const char *full_path);
 extern void fio_pgFileDelete(pgFile *file, const char *full_path);
 
 extern void pgFileFree(void *file);
@@ -1123,6 +1123,7 @@ extern int send_pages(ConnectionArgs* conn_arg, const char *to_fullpath, const c
 					  BackupMode backup_mode, int ptrack_version_num, const char *ptrack_schema);
 
 /* FIO */
+extern void fio_delete(mode_t mode, const char *fullpath, fio_location location);
 extern int fio_send_pages(const char *to_fullpath, const char *from_fullpath, pgFile *file, XLogRecPtr horizonLsn,
 						   int calg, int clevel, uint32 checksum_version, datapagemap_t *pagemap,
 						   BlockNumber* err_blknum, char **errormsg, BackupPageHeader2 **headers);

src/restore.c

@@ -836,7 +836,7 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
 				join_path_components(fullpath, pgdata_path, file->rel_path);
 
 //				fio_pgFileDelete(file, full_file_path);
-				pgFileDelete(file, fullpath);
+				fio_delete(file->mode, fullpath, FIO_DB_HOST);
 				elog(VERBOSE, "Deleted file \"%s\"", fullpath);
 
 				/* shrink pgdata list */

src/utils/file.c

@@ -2492,6 +2492,37 @@ static void fio_check_postmaster_impl(int out, char *buf)
 	IO_CHECK(fio_write_all(out, &hdr, sizeof(hdr)), sizeof(hdr));
 }
 
+/*
+ * Delete file pointed by the pgFile.
+ * If the pgFile points directory, the directory must be empty.
+ */
+void
+fio_delete(mode_t mode, const char *fullpath, fio_location location)
+{
+	if (fio_is_remote(location))
+	{
+		fio_header  hdr;
+
+		hdr.cop = FIO_DELETE;
+		hdr.size = strlen(fullpath) + 1;
+		hdr.arg = mode;
+
+		IO_CHECK(fio_write_all(fio_stdout, &hdr, sizeof(hdr)), sizeof(hdr));
+		IO_CHECK(fio_write_all(fio_stdout, fullpath, hdr.size), hdr.size);
+
+	}
+	else
+		pgFileDelete(mode, fullpath);
+}
+
+static void
+fio_delete_impl(mode_t mode, char *buf)
+{
+	char  *fullpath = (char*) buf;
+
+	pgFileDelete(mode, fullpath);
+}
+
 /* Execute commands at remote host */
 void fio_communicate(int in, int out)
 {
@@ -2675,6 +2706,10 @@ void fio_communicate(int in, int out)
 			/* calculate crc32 for a file */
 			fio_check_postmaster_impl(out, buf);
 			break;
+		  case FIO_DELETE:
+			/* delete file */
+			fio_delete_impl(hdr.arg, buf);
+			break;
 		  case FIO_DISCONNECT:
 			hdr.cop = FIO_DISCONNECTED;
 			IO_CHECK(fio_write_all(out, &hdr, sizeof(hdr)), sizeof(hdr));

src/utils/file.h

@@ -23,6 +23,7 @@ typedef enum
 	FIO_CHMOD,
 	FIO_SEEK,
 	FIO_TRUNCATE,
+	FIO_DELETE,
 	FIO_PREAD,
 	FIO_READ,
 	FIO_LOAD,