db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-11-25 09:01:48 +02:00
Code Issues Releases Activity

minor fixes

Browse Source
This commit is contained in:
Grigory Smolkin 2020-05-23 02:09:42 +03:00
parent 2f7f677d86
commit e802a2d6f4
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/archive.c
View File

@ -1392,7 +1392,7 @@ get_wal_file(const char *filename, const char *from_fullpath,
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
/* If requested file is regular WAL segment, then try to open it with '.gz' suffix... */ /* If requested file is regular WAL segment, then try to open it with '.gz' suffix... */
if (IsXLogFileName(filename)) if (IsXLogFileName(filename))
rc = fio_send_file_gz(from_fullpath_gz, to_fullpath, out, NULL, &errmsg); rc = fio_send_file_gz(from_fullpath_gz, to_fullpath, out, &errmsg);
if (rc == FILE_MISSING) if (rc == FILE_MISSING)
#endif #endif
/* ... failing that, use uncompressed */ /* ... failing that, use uncompressed */
@ -1406,7 +1406,7 @@ get_wal_file(const char *filename, const char *from_fullpath,
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
/* '.gz.partial' goes first ... */ /* '.gz.partial' goes first ... */
snprintf(from_partial, sizeof(from_partial), "%s.gz.partial", from_fullpath); snprintf(from_partial, sizeof(from_partial), "%s.gz.partial", from_fullpath);
rc = fio_send_file_gz(from_partial, to_fullpath, out, NULL, &errmsg); rc = fio_send_file_gz(from_partial, to_fullpath, out, &errmsg);
if (rc == FILE_MISSING) if (rc == FILE_MISSING)
#endif #endif
{ {

3
src/pg_probackup.h
View File

@ -1030,8 +1030,7 @@ extern int fio_send_pages(FILE* out, const char *from_fullpath, pgFile *file, XL
int calg, int clevel, uint32 checksum_version, int calg, int clevel, uint32 checksum_version,
datapagemap_t *pagemap, BlockNumber* err_blknum, char **errormsg); datapagemap_t *pagemap, BlockNumber* err_blknum, char **errormsg);
/* return codes for fio_send_pages */ /* return codes for fio_send_pages */
extern int fio_send_file_gz(const char *from_fullpath, const char *to_fullpath, FILE* out, extern int fio_send_file_gz(const char *from_fullpath, const char *to_fullpath, FILE* out, char **errormsg);
pgFile *file, char **errormsg);
extern int fio_send_file(const char *from_fullpath, const char *to_fullpath, FILE* out, extern int fio_send_file(const char *from_fullpath, const char *to_fullpath, FILE* out,
pgFile *file, char **errormsg); pgFile *file, char **errormsg);

3
src/utils/file.c
View File

@ -1732,8 +1732,7 @@ cleanup:
* ZLIB_ERROR (-5) * ZLIB_ERROR (-5)
* REMOTE_ERROR (-6) * REMOTE_ERROR (-6)
*/ */
int fio_send_file_gz(const char *from_fullpath, const char *to_fullpath, FILE* out, int fio_send_file_gz(const char *from_fullpath, const char *to_fullpath, FILE* out, char **errormsg)
pgFile *file, char **errormsg)
{ {
fio_header hdr; fio_header hdr;
int exit_code = SEND_OK; int exit_code = SEND_OK;