Skip to content

Commit 1ea48b1

Browse files
committed
[Issue #228] a bit of cleaning
1 parent c670de2 commit 1ea48b1

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

src/data.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -816,10 +816,6 @@ restore_data_file(parray *parent_chain, pgFile *dest_file, FILE *out,
816816
/* set stdio buffering for input data file */
817817
setvbuf(in, in_buf, _IOFBF, STDIO_BUFSIZE);
818818

819-
// elog(INFO, "N_HEADERS: %i", tmp_file->n_headers);
820-
// elog(INFO, "File: %s", tmp_file->rel_path);
821-
// elog(INFO, "Backup: %s", base36enc(backup->start_time));
822-
823819
/* get headers for this file */
824820
if (use_headers && tmp_file->n_headers > 0)
825821
headers = get_data_file_headers(&(backup->hdr_map), tmp_file,
@@ -934,7 +930,7 @@ restore_data_file_internal(FILE *in, FILE *out, pgFile *file, uint32 backup_vers
934930
else
935931
{
936932
/* We get into this function either when restoring old backup
937-
* or when merging something. Align read_len only in restoring
933+
* or when merging something. Align read_len only when restoring
938934
* or merging old backups.
939935
*/
940936
if (get_page_header(in, from_fullpath, &(page).bph, NULL, false))
@@ -1926,10 +1922,9 @@ bool
19261922
get_page_header(FILE *in, const char *fullpath, BackupPageHeader* bph,
19271923
pg_crc32 *crc, bool use_crc32c)
19281924
{
1929-
19301925
/* read BackupPageHeader */
19311926
size_t read_len = fread(bph, 1, sizeof(BackupPageHeader), in);
1932-
1927+
19331928
if (ferror(in))
19341929
elog(ERROR, "Cannot read file \"%s\": %s",
19351930
fullpath, strerror(errno));

src/dir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ read_tablespace_map(parray *files, const char *backup_dir)
12131213
*
12141214
*
12151215
* TODO: maybe when running incremental restore with tablespace remapping, then
1216-
* new tablespace directory MUST be empty? because there is no
1216+
* new tablespace directory MUST be empty? because there is no way
12171217
* we can be sure, that files laying there belong to our instance.
12181218
*/
12191219
void

src/pg_probackup.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,8 +1110,8 @@ extern FILE* open_local_file_rw(const char *to_fullpath, char **out_buf, uint32
11101110

11111111
extern int send_pages(ConnectionArgs* conn_arg, const char *to_fullpath, const char *from_fullpath,
11121112
pgFile *file, XLogRecPtr prev_backup_start_lsn, CompressAlg calg, int clevel,
1113-
uint32 checksum_version, bool use_pagemap, BackupPageHeader2 **headers,
1114-
BackupMode backup_mode, int ptrack_version_num, const char *ptrack_schema);
1113+
uint32 checksum_version, bool use_pagemap, BackupPageHeader2 **headers,
1114+
BackupMode backup_mode, int ptrack_version_num, const char *ptrack_schema);
11151115

11161116
/* FIO */
11171117
extern int fio_send_pages(const char *to_fullpath, const char *from_fullpath, pgFile *file, XLogRecPtr horizonLsn,

0 commit comments

Comments
 (0)