|
10 | 10 | * |
11 | 11 | * |
12 | 12 | * IDENTIFICATION |
13 | | - * $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.86 2010/01/06 02:41:37 momjian Exp $ |
| 13 | + * $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.87 2010/01/12 02:42:51 momjian Exp $ |
14 | 14 | * |
15 | 15 | *------------------------------------------------------------------------- |
16 | 16 | */ |
@@ -115,16 +115,17 @@ relpath(RelFileNode rnode, ForkNumber forknum) |
115 | 115 | else |
116 | 116 | { |
117 | 117 | /* All other tablespaces are accessed via symlinks */ |
118 | | - pathlen = 10 + OIDCHARS + 1 + OIDCHARS + 1 + OIDCHARS + 1 |
119 | | - + FORKNAMECHARS + 1; |
| 118 | + pathlen = 9 + 1 + OIDCHARS + 1 + strlen(TABLESPACE_VERSION_DIRECTORY) + |
| 119 | + 1 + OIDCHARS + 1 + OIDCHARS + 1 + FORKNAMECHARS + 1; |
120 | 120 | path = (char *) palloc(pathlen); |
121 | 121 | if (forknum != MAIN_FORKNUM) |
122 | | - snprintf(path, pathlen, "pg_tblspc/%u/%u/%u_%s", |
123 | | - rnode.spcNode, rnode.dbNode, rnode.relNode, |
124 | | - forkNames[forknum]); |
| 122 | + snprintf(path, pathlen, "pg_tblspc/%u/%s/%u/%u_%s", |
| 123 | + rnode.spcNode, TABLESPACE_VERSION_DIRECTORY, |
| 124 | + rnode.dbNode, rnode.relNode, forkNames[forknum]); |
125 | 125 | else |
126 | | - snprintf(path, pathlen, "pg_tblspc/%u/%u/%u", |
127 | | - rnode.spcNode, rnode.dbNode, rnode.relNode); |
| 126 | + snprintf(path, pathlen, "pg_tblspc/%u/%s/%u/%u", |
| 127 | + rnode.spcNode, TABLESPACE_VERSION_DIRECTORY, |
| 128 | + rnode.dbNode, rnode.relNode); |
128 | 129 | } |
129 | 130 | return path; |
130 | 131 | } |
@@ -161,10 +162,11 @@ GetDatabasePath(Oid dbNode, Oid spcNode) |
161 | 162 | else |
162 | 163 | { |
163 | 164 | /* All other tablespaces are accessed via symlinks */ |
164 | | - pathlen = 10 + OIDCHARS + 1 + OIDCHARS + 1; |
| 165 | + pathlen = 9 + 1 + OIDCHARS + 1 + strlen(TABLESPACE_VERSION_DIRECTORY) + |
| 166 | + 1 + OIDCHARS + 1; |
165 | 167 | path = (char *) palloc(pathlen); |
166 | | - snprintf(path, pathlen, "pg_tblspc/%u/%u", |
167 | | - spcNode, dbNode); |
| 168 | + snprintf(path, pathlen, "pg_tblspc/%u/%s/%u", |
| 169 | + spcNode, TABLESPACE_VERSION_DIRECTORY, dbNode); |
168 | 170 | } |
169 | 171 | return path; |
170 | 172 | } |
|
0 commit comments