Commit82d7959

committed

Do not use pointer for prev_backup_start_lsn

1 parent28626dc commit82d7959Copy full SHA for 82d7959

File tree

-8

lines changed

-8

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ typedef struct`
`47`	`47`	`constchar*to_root;`
`48`	`48`	`parray*backup_files_list;`
`49`	`49`	`parray*prev_backup_filelist;`
`50`		`-constXLogRecPtr*prev_backup_start_lsn;`
	`50`	`+XLogRecPtrprev_backup_start_lsn;`
`51`	`51`	`}backup_files_args;`
`52`	`52`
`53`	`53`	`/*`
`@@ -101,7 +101,7 @@ do_backup_database(parray *backup_list)`
`101`	`101`	`chardatabase_path[MAXPGPATH];`
`102`	`102`	`chardst_backup_path[MAXPGPATH];`
`103`	`103`	`charlabel[1024];`
`104`		`-XLogRecPtr*prev_backup_start_lsn=NULL;`
	`104`	`+XLogRecPtrprev_backup_start_lsn=InvalidXLogRecPtr;`
`105`	`105`
`106`	`106`	`pthread_tbackup_threads[num_threads];`
`107`	`107`	`pthread_tstream_thread;`
`@@ -189,7 +189,7 @@ do_backup_database(parray *backup_list)`
`189`	`189`	`prev_backup_filelist=dir_read_file_list(pgdata,prev_backup_filelist_path);`
`190`	`190`
`191`	`191`	`/* If lsn is not NULL, only pages with higher lsn will be copied. */`
`192`		`-prev_backup_start_lsn=&prev_backup->start_lsn;`
	`192`	`+prev_backup_start_lsn=prev_backup->start_lsn;`
`193`	`193`
`194`	`194`	`current.parent_backup=prev_backup->start_time;`
`195`	`195`	`pgBackupWriteBackupControlFile(&current);`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ parse_page(const DataPage page, XLogRecPtr lsn)`
`53`	`53`	`* to the backup file.`
`54`	`54`	`*/`
`55`	`55`	`staticvoid`
`56`		`-backup_data_page(pgFilefile,constXLogRecPtrprev_backup_start_lsn,`
	`56`	`+backup_data_page(pgFile*file,XLogRecPtrprev_backup_start_lsn,`
`57`	`57`	`BlockNumberblknum,BlockNumbernblocks,`
`58`	`58`	`FILEin,FILEout,`
`59`	`59`	`pg_crc32*crc)`
`@@ -137,9 +137,9 @@ backup_data_page(pgFile file, const XLogRecPtr prev_backup_start_lsn,`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`/* If the page hasn't changed since previous backup, don't backup it. */`
`140`		`-if (prev_backup_start_lsn`
	`140`	`+if (!XLogRecPtrIsInvalid(prev_backup_start_lsn)`
`141`	`141`	`&& !XLogRecPtrIsInvalid(page_lsn)`
`142`		`-&&page_lsn<*prev_backup_start_lsn)`
	`142`	`+&&page_lsn<prev_backup_start_lsn)`
`143`	`143`	`return;`
`144`	`144`
`145`	`145`	`/* Verify checksum */`
`@@ -194,7 +194,7 @@ backup_data_page(pgFile file, const XLogRecPtr prev_backup_start_lsn,`
`194`	`194`	`*/`
`195`	`195`	`bool`
`196`	`196`	`backup_data_file(constcharfrom_root,constcharto_root,`
`197`		`-pgFilefile,constXLogRecPtrprev_backup_start_lsn)`
	`197`	`+pgFile*file,XLogRecPtrprev_backup_start_lsn)`
`198`	`198`	`{`
`199`	`199`	`charto_path[MAXPGPATH];`
`200`	`200`	`FILE*in;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ extern int pgFileCompareSize(const void f1, const void f2);`
`340`	`340`
`341`	`341`	`/* in data.c */`
`342`	`342`	`externboolbackup_data_file(constcharfrom_root,constcharto_root,`
`343`		`-pgFilefile,constXLogRecPtrlsn);`
	`343`	`+pgFile*file,XLogRecPtrprev_backup_start_lsn);`
`344`	`344`	`externvoidrestore_data_file(constcharfrom_root,constcharto_root,`
`345`	`345`	`pgFilefile,pgBackupbackup);`
`346`	`346`	`externboolis_compressed_data_file(pgFile*file);`

Comments

(0)