rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename pg_tablespaces directory to pg_tblspc, so it is more unique from 

the pg_tablespace table.  Update catalog version.
This commit is contained in:
Bruce Momjian 2004-06-21 01:04:45 +00:00
parent ac334e9551
commit 483b7f8249
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/catalog/catalog.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.52 2004/06/18 06:13:19 tgl Exp $ * $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.53 2004/06/21 01:04:41 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -60,7 +60,7 @@ relpath(RelFileNode rnode)
/* All other tablespaces are accessed via symlinks */ /* All other tablespaces are accessed via symlinks */
pathlen = strlen(DataDir) + 16 + OIDCHARS + 1 + OIDCHARS + 1 + OIDCHARS + 1; pathlen = strlen(DataDir) + 16 + OIDCHARS + 1 + OIDCHARS + 1 + OIDCHARS + 1;
path = (char *) palloc(pathlen); path = (char *) palloc(pathlen);
snprintf(path, pathlen, "%s/pg_tablespaces/%u/%u/%u", snprintf(path, pathlen, "%s/pg_tblspc/%u/%u/%u",
DataDir, rnode.spcNode, rnode.dbNode, rnode.relNode); DataDir, rnode.spcNode, rnode.dbNode, rnode.relNode);
} }
return path; return path;
@ -101,7 +101,7 @@ GetDatabasePath(Oid dbNode, Oid spcNode)
/* All other tablespaces are accessed via symlinks */ /* All other tablespaces are accessed via symlinks */
pathlen = strlen(DataDir) + 16 + OIDCHARS + 1 + OIDCHARS + 1; pathlen = strlen(DataDir) + 16 + OIDCHARS + 1 + OIDCHARS + 1;
path = (char *) palloc(pathlen); path = (char *) palloc(pathlen);
snprintf(path, pathlen, "%s/pg_tablespaces/%u/%u", snprintf(path, pathlen, "%s/pg_tblspc/%u/%u",
DataDir, spcNode, dbNode); DataDir, spcNode, dbNode);
} }
return path; return path;

10
src/backend/commands/tablespace.c
View File

@ -14,10 +14,10 @@
* files within a tablespace into database-specific subdirectories. * files within a tablespace into database-specific subdirectories.
* *
* To support file access via the information given in RelFileNode, we * To support file access via the information given in RelFileNode, we
* maintain a symbolic-link map in $PGDATA/pg_tablespaces. The symlinks are * maintain a symbolic-link map in $PGDATA/pg_tblspc. The symlinks are
* named by tablespace OIDs and point to the actual tablespace directories. * named by tablespace OIDs and point to the actual tablespace directories.
* Thus the full path to an arbitrary file is * Thus the full path to an arbitrary file is
* $PGDATA/pg_tablespaces/spcoid/dboid/relfilenode * $PGDATA/pg_tblspc/spcoid/dboid/relfilenode
* *
* There are two tablespaces created at initdb time: global (for shared * There are two tablespaces created at initdb time: global (for shared
* tables) and default (for everything else). For backwards compatibility * tables) and default (for everything else). For backwards compatibility
@ -45,7 +45,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.1 2004/06/18 06:13:23 tgl Exp $ * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.2 2004/06/21 01:04:42 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -305,7 +305,7 @@ CreateTableSpace(CreateTableSpaceStmt *stmt)
* All seems well, create the symlink * All seems well, create the symlink
*/ */
linkloc = (char *) palloc(strlen(DataDir) + 16 + 10 + 1); linkloc = (char *) palloc(strlen(DataDir) + 16 + 10 + 1);
sprintf(linkloc, "%s/pg_tablespaces/%u", DataDir, tablespaceoid); sprintf(linkloc, "%s/pg_tblspc/%u", DataDir, tablespaceoid);
if (symlink(location, linkloc) < 0) if (symlink(location, linkloc) < 0)
ereport(ERROR, ereport(ERROR,
@ -385,7 +385,7 @@ DropTableSpace(DropTableSpaceStmt *stmt)
tablespacename); tablespacename);
location = (char *) palloc(strlen(DataDir) + 16 + 10 + 1); location = (char *) palloc(strlen(DataDir) + 16 + 10 + 1);
sprintf(location, "%s/pg_tablespaces/%u", DataDir, tablespaceoid); sprintf(location, "%s/pg_tblspc/%u", DataDir, tablespaceoid);
/* /*
* Check if the tablespace still contains any files. We try to rmdir * Check if the tablespace still contains any files. We try to rmdir

4
src/bin/initdb/initdb.c
View File

@ -39,7 +39,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.38 2004/06/18 06:13:58 tgl Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.39 2004/06/21 01:04:44 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1785,7 +1785,7 @@ main(int argc, char *argv[])
char *pgdenv; /* PGDATA value got from sent to char *pgdenv; /* PGDATA value got from sent to
* environment */ * environment */
char *subdirs[] = char *subdirs[] =
{"global", "pg_xlog", "pg_clog", "base", "base/1", "pg_tablespaces"}; {"global", "pg_xlog", "pg_clog", "base", "base/1", "pg_tblspc"};
progname = get_progname(argv[0]); progname = get_progname(argv[0]);
set_pglocale_pgservice(argv[0], "initdb"); set_pglocale_pgservice(argv[0], "initdb");

4
src/include/catalog/catversion.h
View File

@ -37,7 +37,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.237 2004/06/18 06:14:05 tgl Exp $ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.238 2004/06/21 01:04:45 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -53,6 +53,6 @@
*/ */
/* yyyymmddN */ /* yyyymmddN */
#define CATALOG_VERSION_NO 200406171 #define CATALOG_VERSION_NO 200406201
#endif #endif