Commit9f1424b

Michael Paquier

committed

Remove use of xlog_fname in code

Let's rely on Postgres stuff instead.Based on a patch by YUriy Zhuravlev for the backup part, updated byme for the restore part.

1 parentc5c07d8 commit9f1424bCopy full SHA for 9f1424b

File tree

-15

lines changed

-15

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -626,6 +626,7 @@ wait_for_archive(pgBackup backup, const char sql)`
`626`	`626`	`inttry_count;`
`627`	`627`	`XLogRecPtrlsn;`
`628`	`628`	`TimeLineIDtli;`
	`629`	`+XLogSegNotargetSegNo;`
`629`	`630`
`630`	`631`	`reconnect();`
`631`	`632`	`res=execute(sql,0,NULL);`
`@@ -651,12 +652,13 @@ wait_for_archive(pgBackup backup, const char sql)`
`651`	`652`	`}`
`652`	`653`
`653`	`654`	`/* As well as WAL file name */`
`654`		`-xlog_fname(file_name,tli,lsn);`
	`655`	`+XLByteToSeg(lsn,targetSegNo);`
	`656`	`+XLogFileName(file_name,tli,targetSegNo+1);`
`655`	`657`
`656`	`658`	`snprintf(ready_path,lengthof(ready_path),`
`657`	`659`	`"%s/pg_xlog/archive_status/%s.ready",pgdata,`
`658`	`660`	`file_name);`
`659`		`-elog(LOG,"%s() wait for %s",__FUNCTION__,ready_path);`
	`661`	`+elog(LOG,"%s() wait for %s\n",__FUNCTION__,ready_path);`
`660`	`662`
`661`	`663`	`PQclear(res);`
`662`	`664`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,6 @@ extern int pgFileCompareMtimeDesc(const void f1, const void f2);`
`287`	`287`
`288`	`288`	`/* in xlog.c */`
`289`	`289`	`externboolxlog_is_complete_wal(constpgFile*file);`
`290`		`-externvoidxlog_fname(char*fname,TimeLineIDtli,XLogRecPtrlsn);`
`291`	`290`
`292`	`291`	`/* in data.c */`
`293`	`292`	`externboolbackup_data_file(constcharfrom_root,constcharto_root,`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -772,8 +772,10 @@ search_next_wal(const char path, XLogRecPtr need_lsn, parray *timelines)`
`772`	`772`	`for (i=0;i<parray_num(timelines);i++)`
`773`	`773`	`{`
`774`	`774`	`pgTimeLinetimeline= (pgTimeLine)parray_get(timelines,i);`
	`775`	`+XLogSegNotargetSegNo;`
`775`	`776`
`776`		`-xlog_fname(xlogfname,timeline->tli,*need_lsn);`
	`777`	`+XLByteToSeg(*need_lsn,targetSegNo);`
	`778`	`+XLogFileName(xlogfname,timeline->tli,targetSegNo);`
`777`	`779`	`join_path_components(xlogpath,path,xlogfname);`
`778`	`780`
`779`	`781`	`if (stat(xlogpath,&st)==0)`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,14 +68,3 @@ xlog_is_complete_wal(const pgFile *file)`
`68`	`68`
`69`	`69`	`return true;`
`70`	`70`	`}`
`71`		`-`
`72`		`-/*`
`73`		`- * based on XLogFileName() in xlog_internal.h`
`74`		`- */`
`75`		`-void`
`76`		`-xlog_fname(char*fname,TimeLineIDtli,XLogRecPtrlsn)`
`77`		`-{`
`78`		`-snprintf(fname,MAXFNAMELEN,"%08X%08X%08X",tli,`
`79`		`- (uint32) (lsn >>32),`
`80`		`- (uint32) (lsn /XLogSegSize));`
`81`		`-}`

Comments

(0)