diff options
| author | Bruce Momjian <bruce@momjian.us> | 2010-01-12 02:42:52 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2010-01-12 02:42:52 +0000 |
| commit | 228170410dd407f266e777dd49916aff0b1b5936 (patch) | |
| tree | f29f53537d487ca646538ab2c7e4d8f0bfe6ea71 /src/backend/utils/adt/dbsize.c | |
| parent | 894fc6b763c2053c01a5be5d20a76d1db650547d (diff) | |
| download | postgresql-228170410dd407f266e777dd49916aff0b1b5936.tar.gz postgresql-228170410dd407f266e777dd49916aff0b1b5936.zip | |
Please tablespace directories in their own subdirectory so pg_migrator
can upgrade clusters without renaming the tablespace directories. New
directory structure format is, e.g.:
$PGDATA/pg_tblspc/20981/PG_8.5_201001061/719849/83292814
Diffstat (limited to 'src/backend/utils/adt/dbsize.c')
| -rw-r--r-- | src/backend/utils/adt/dbsize.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c index 77eb4d923ba..d8d2aaa238c 100644 --- a/src/backend/utils/adt/dbsize.c +++ b/src/backend/utils/adt/dbsize.c @@ -5,7 +5,7 @@ * Copyright (c) 2002-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.25 2010/01/02 16:57:53 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.26 2010/01/12 02:42:52 momjian Exp $ * */ @@ -108,8 +108,8 @@ calculate_database_size(Oid dbOid) strcmp(direntry->d_name, "..") == 0) continue; - snprintf(pathname, MAXPGPATH, "pg_tblspc/%s/%u", - direntry->d_name, dbOid); + snprintf(pathname, MAXPGPATH, "pg_tblspc/%s/%s/%u", + direntry->d_name, TABLESPACE_VERSION_DIRECTORY, dbOid); totalsize += db_dir_size(pathname); } @@ -179,7 +179,8 @@ calculate_tablespace_size(Oid tblspcOid) else if (tblspcOid == GLOBALTABLESPACE_OID) snprintf(tblspcPath, MAXPGPATH, "global"); else - snprintf(tblspcPath, MAXPGPATH, "pg_tblspc/%u", tblspcOid); + snprintf(tblspcPath, MAXPGPATH, "pg_tblspc/%u/%s", tblspcOid, + TABLESPACE_VERSION_DIRECTORY); dirdesc = AllocateDir(tblspcPath); |