sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-29 00:03:09 -04:00
Code Issues Projects Releases Wiki Activity

Minor code cleanup for perform_base_backup().

Browse Source 
Merge two calls to sendDir() that are exactly the same except for
the fifth argument. Adjust comments to match.

Also, don't bother checking whether tblspc_map_file is NULL. We
initialize it in all cases, so it can't be.

Patch by me, reviewed by Amit Kapila and Kyotaro Horiguchi.

Discussion: http://postgr.es/m/CA+TgmoYq+59SJ2zBbP891ngWPA9fymOqntqYcweSDYXS2a620A@mail.gmail.com
This commit is contained in:
Robert Haas 2020-06-17 11:05:42 -04:00
parent 1fa092913d
commit 453e0e3f0e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/replication/basebackup.c
View File

@ -269,7 +269,7 @@ perform_base_backup(basebackup_options *opt)
XLogRecPtr endptr; XLogRecPtr endptr;
TimeLineID endtli; TimeLineID endtli;
StringInfo labelfile; StringInfo labelfile;
StringInfo tblspc_map_file = NULL; StringInfo tblspc_map_file;
backup_manifest_info manifest; backup_manifest_info manifest;
int datadirpathlen; int datadirpathlen;
List *tablespaces = NIL; List *tablespaces = NIL;
@ -424,25 +424,23 @@ perform_base_backup(basebackup_options *opt)
if (ti->path == NULL) if (ti->path == NULL)
{ {
struct stat statbuf; struct stat statbuf;
bool sendtblspclinks = true;
/* In the main tar, include the backup_label first... */ /* In the main tar, include the backup_label first... */
sendFileWithContent(BACKUP_LABEL_FILE, labelfile->data, sendFileWithContent(BACKUP_LABEL_FILE, labelfile->data,
&manifest); &manifest);
/* /* Then the tablespace_map file, if required... */
* Send tablespace_map file if required and then the bulk of if (opt->sendtblspcmapfile)
* the files.
*/
if (tblspc_map_file && opt->sendtblspcmapfile)
{ {
sendFileWithContent(TABLESPACE_MAP, tblspc_map_file->data, sendFileWithContent(TABLESPACE_MAP, tblspc_map_file->data,
&manifest); &manifest);
sendDir(".", 1, false, tablespaces, false, sendtblspclinks = false;
&manifest, NULL);
} }
else
sendDir(".", 1, false, tablespaces, true, /* Then the bulk of the files... */
&manifest, NULL); sendDir(".", 1, false, tablespaces, sendtblspclinks,
&manifest, NULL);
/* ... and pg_control after everything else. */ /* ... and pg_control after everything else. */
if (lstat(XLOG_CONTROL_FILE, &statbuf) != 0) if (lstat(XLOG_CONTROL_FILE, &statbuf) != 0)