Commit635a4a5

committed

Added pgBackupGetPath2()

1 parentd10b05b commit635a4a5Copy full SHA for 635a4a5

File tree

+25

-7

lines changed

+25

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1676,13 +1676,13 @@ StreamLog(void *arg)`
`1676`	`1676`	`ctl.synchronous= false;`
`1677`	`1677`	`ctl.mark_done= false;`
`1678`	`1678`	`if(ReceiveXlogStream(conn,&ctl)== false)`
`1679`		`-elog(ERROR,"Problem inrecivexlog");`
	`1679`	`+elog(ERROR,"Problem inreceivexlog");`
`1680`	`1680`	`}`
`1681`	`1681`	`#else`
`1682`	`1682`	`if(ReceiveXlogStream(conn,startpos,starttli,NULL,basedir,`
`1683`	`1683`	`stop_streaming,standby_message_timeout,NULL,`
`1684`	`1684`	`false, false)== false)`
`1685`		`-elog(ERROR,"Problem inrecivexlog");`
	`1685`	`+elog(ERROR,"Problem inreceivexlog");`
`1686`	`1686`	`#endif`
`1687`	`1687`
`1688`	`1688`	`PQfinish(conn);`

Lines changed: 21 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -613,14 +613,32 @@ pgBackupCompareIdDesc(const void l, const void r)`
`613`	`613`	`*/`
`614`	`614`	`void`
`615`	`615`	`pgBackupGetPath(constpgBackupbackup,charpath,size_tlen,constchar*subdir)`
	`616`	`+{`
	`617`	`+pgBackupGetPath2(backup,path,len,subdir,NULL);`
	`618`	`+}`
	`619`	`+`
	`620`	`+/*`
	`621`	`+ * Construct absolute path of the backup directory.`
	`622`	`+ * Append "subdir1" and "subdir2" to the backup directory.`
	`623`	`+ */`
	`624`	`+void`
	`625`	`+pgBackupGetPath2(constpgBackupbackup,charpath,size_tlen,`
	`626`	`+constcharsubdir1,constcharsubdir2)`
`616`	`627`	`{`
`617`	`628`	`char*datetime;`
`618`	`629`
`619`	`630`	`datetime=base36enc(backup->start_time);`
`620`		`-if (subdir)`
`621`		`-snprintf(path,len,"%s/%s/%s",backup_instance_path,datetime,subdir);`
	`631`	`+`
	`632`	`+/* If "subdir1" is NULL do not check "subdir2" */`
	`633`	`+if (!subdir1)`
	`634`	`+snprintf(path,len,"%s/%s/%s",backup_path,BACKUPS_DIR,datetime);`
	`635`	`+elseif (!subdir2)`
	`636`	`+snprintf(path,len,"%s/%s/%s/%s",backup_path,BACKUPS_DIR,datetime,subdir1);`
	`637`	`+/* "subdir1" and "subdir2" is not NULL */`
`622`	`638`	`else`
`623`		`-snprintf(path,len,"%s/%s",backup_instance_path,datetime);`
	`639`	`+snprintf(path,len,"%s/%s/%s/%s/%s",backup_path,BACKUPS_DIR,`
	`640`	`+datetime,subdir1,subdir2);`
	`641`	`+`
`624`	`642`	`free(datetime);`
`625`	`643`
`626`	`644`	`make_native_path(path);`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,8 @@ extern void catalog_lock(void);`
`338`	`338`	`externvoidpgBackupWriteControl(FILEout,pgBackupbackup);`
`339`	`339`	`externvoidpgBackupWriteBackupControlFile(pgBackup*backup);`
`340`	`340`	`externvoidpgBackupGetPath(constpgBackupbackup,charpath,size_tlen,constchar*subdir);`
	`341`	`+externvoidpgBackupGetPath2(constpgBackupbackup,charpath,size_tlen,`
	`342`	`+constcharsubdir1,constcharsubdir2);`
`341`	`343`	`externintpgBackupCreateDir(pgBackup*backup);`
`342`	`344`	`externvoidpgBackupFree(void*backup);`
`343`	`345`	`externintpgBackupCompareId(constvoidf1,constvoidf2);`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -373,11 +373,9 @@ remove_deleted_files(pgBackup *backup)`
`373`	`373`	`{`
`374`	`374`	`parray*files;`
`375`	`375`	`parray*files_restored;`
`376`		`-chardatabase_path[MAXPGPATH];`
`377`	`376`	`charfilelist_path[MAXPGPATH];`
`378`	`377`	`inti;`
`379`	`378`
`380`		`-pgBackupGetPath(backup,database_path,lengthof(database_path),DATABASE_DIR);`
`381`	`379`	`pgBackupGetPath(backup,filelist_path,lengthof(filelist_path),DATABASE_FILE_LIST);`
`382`	`380`	`/* Read backup's filelist using target database path as base path */`
`383`	`381`	`files=dir_read_file_list(pgdata,filelist_path);`

Comments

(0)