mirror of
https://github.com/postgres/postgres.git
synced 2025-08-19 23:22:23 +03:00
Define PG_TBLSPC_DIR for path pg_tblspc/ in data folder
Similarly to 2065ddf5e3
, this introduces a define for "pg_tblspc".
This makes the style more consistent with the existing PG_STAT_TMP_DIR,
for example.
There is a difference with the other cases with the introduction of
PG_TBLSPC_DIR_SLASH, required in two places for recovery and backups.
Author: Bertrand Drouvot
Reviewed-by: Ashutosh Bapat, Álvaro Herrera, Yugo Nagata, Michael
Paquier
Discussion: https://postgr.es/m/ZryVvjqS9SnV1GPP@ip-10-97-1-34.eu-west-3.compute.internal
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
#include "access/xlog.h"
|
||||
#include "backup/backup_manifest.h"
|
||||
#include "backup/basebackup_sink.h"
|
||||
#include "common/relpath.h"
|
||||
#include "mb/pg_wchar.h"
|
||||
#include "utils/builtins.h"
|
||||
#include "utils/json.h"
|
||||
@@ -117,7 +118,7 @@ AddFileToBackupManifest(backup_manifest_info *manifest, Oid spcoid,
|
||||
*/
|
||||
if (OidIsValid(spcoid))
|
||||
{
|
||||
snprintf(pathbuf, sizeof(pathbuf), "pg_tblspc/%u/%s", spcoid,
|
||||
snprintf(pathbuf, sizeof(pathbuf), "%s/%u/%s", PG_TBLSPC_DIR, spcoid,
|
||||
pathname);
|
||||
pathname = pathbuf;
|
||||
}
|
||||
|
@@ -1488,7 +1488,7 @@ sendDir(bbsink *sink, const char *path, int basepathlen, bool sizeonly,
|
||||
if (OidIsValid(spcoid))
|
||||
{
|
||||
relspcoid = spcoid;
|
||||
lookup_path = psprintf("pg_tblspc/%u/%s", spcoid,
|
||||
lookup_path = psprintf("%s/%u/%s", PG_TBLSPC_DIR, spcoid,
|
||||
tarfilename);
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user