mirror of
https://github.com/postgres/postgres.git
synced 2025-07-15 19:21:59 +03:00
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
This commit is contained in:
@ -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);
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.73 2010/01/02 16:57:54 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.74 2010/01/12 02:42:52 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -20,6 +20,7 @@
|
||||
#include <math.h>
|
||||
|
||||
#include "access/xact.h"
|
||||
#include "catalog/catalog.h"
|
||||
#include "catalog/pg_type.h"
|
||||
#include "catalog/pg_tablespace.h"
|
||||
#include "commands/dbcommands.h"
|
||||
@ -185,7 +186,8 @@ pg_tablespace_databases(PG_FUNCTION_ARGS)
|
||||
/*
|
||||
* size = tablespace dirname length + dir sep char + oid + terminator
|
||||
*/
|
||||
fctx->location = (char *) palloc(10 + 10 + 1);
|
||||
fctx->location = (char *) palloc(9 + 1 + OIDCHARS + 1 +
|
||||
strlen(TABLESPACE_VERSION_DIRECTORY) + 1);
|
||||
if (tablespaceOid == GLOBALTABLESPACE_OID)
|
||||
{
|
||||
fctx->dirdesc = NULL;
|
||||
@ -197,7 +199,8 @@ pg_tablespace_databases(PG_FUNCTION_ARGS)
|
||||
if (tablespaceOid == DEFAULTTABLESPACE_OID)
|
||||
sprintf(fctx->location, "base");
|
||||
else
|
||||
sprintf(fctx->location, "pg_tblspc/%u", tablespaceOid);
|
||||
sprintf(fctx->location, "pg_tblspc/%u/%s", tablespaceOid,
|
||||
TABLESPACE_VERSION_DIRECTORY);
|
||||
|
||||
fctx->dirdesc = AllocateDir(fctx->location);
|
||||
|
||||
|
6
src/backend/utils/cache/relcache.c
vendored
6
src/backend/utils/cache/relcache.c
vendored
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.297 2010/01/07 20:39:45 rhaas Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.298 2010/01/12 02:42:52 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -4302,8 +4302,8 @@ RelationCacheInitFileRemove(void)
|
||||
if (strspn(de->d_name, "0123456789") == strlen(de->d_name))
|
||||
{
|
||||
/* Scan the tablespace dir for per-database dirs */
|
||||
snprintf(path, sizeof(path), "%s/%s",
|
||||
tblspcdir, de->d_name);
|
||||
snprintf(path, sizeof(path), "%s/%s/%s",
|
||||
tblspcdir, de->d_name, TABLESPACE_VERSION_DIRECTORY);
|
||||
RelationCacheInitFileRemoveInDir(path);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user