postgrespro
diff --git a/‎contrib/pg_xlogdump/pg_xlogdump.c
Lines changed: 0 additions & 1 deletion b/‎contrib/pg_xlogdump/pg_xlogdump.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎doc/src/sgml/func.sgml
Lines changed: 11 additions & 9 deletions b/‎doc/src/sgml/func.sgml
Lines changed: 11 additions & 9 deletions
diff --git a/‎src/backend/access/rmgrdesc/smgrdesc.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/access/rmgrdesc/smgrdesc.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/access/rmgrdesc/xactdesc.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/access/rmgrdesc/xactdesc.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/access/rmgrdesc/xlogdesc.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/access/rmgrdesc/xlogdesc.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/access/transam/xlogutils.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/access/transam/xlogutils.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/catalog/catalog.c
Lines changed: 0 additions & 51 deletions b/‎src/backend/catalog/catalog.c
Lines changed: 0 additions & 51 deletions
diff --git a/‎src/backend/commands/tablecmds.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/commands/tablecmds.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/commands/tablespace.c
Lines changed: 3 additions & 4 deletions b/‎src/backend/commands/tablespace.c
Lines changed: 3 additions & 4 deletions
diff --git a/‎src/backend/replication/basebackup.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/replication/basebackup.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/replication/logical/reorderbuffer.c
Lines changed: 2 additions & 9 deletions b/‎src/backend/replication/logical/reorderbuffer.c
Lines changed: 2 additions & 9 deletions
diff --git a/‎src/backend/storage/buffer/bufmgr.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/storage/buffer/bufmgr.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/storage/buffer/localbuf.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/storage/buffer/localbuf.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/storage/file/fd.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/storage/file/fd.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/storage/smgr/md.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/storage/smgr/md.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/utils/adt/dbsize.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/utils/adt/dbsize.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/utils/adt/misc.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/utils/adt/misc.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/backend/utils/cache/relcache.c
Lines changed: 0 additions & 1 deletion b/‎src/backend/utils/cache/relcache.c
Lines changed: 0 additions & 1 deletion
@@ -19,7 +19,6 @@
 #include "access/xlogreader.h"
 #include "access/transam.h"
 #include "common/fe_memutils.h"
-#include "common/relpath.h"
 #include "getopt_long.h"
 #include "rmgrdesc.h"
 
 
@@ -16847,7 +16847,7 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
        <entry><type>bigint</type></entry>
        <entry>
         Disk space used by the specified fork (<literal>'main'</literal>,
-        <literal>'fsm'</literal> or <literal>'vm'</>)
+        <literal>'fsm'</literal>, <literal>'vm'</>, or <literal>'init'</>)
         of the specified table or index
        </entry>
       </row>
@@ -16951,14 +16951,16 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
 
    <para>
     <function>pg_relation_size</> accepts the OID or name of a table, index or
-    toast table, and returns the on-disk size in bytes. Specifying
-    <literal>'main'</literal> or leaving out the second argument
9E81
 returns the
-    size of the main data fork of the relation. Specifying
-    <literal>'fsm'</literal> returns the size of the
-    Free Space Map (see <xref linkend="storage-fsm">) associated with the
-    relation. Specifying <literal>'vm'</literal> returns the size of the
-    Visibility Map (see <xref linkend="storage-vm">) associated with the
-    relation.  Note that this function shows the size of only one fork;
+    toast table, and returns the on-disk size in bytes.
+    Specifying <literal>'main'</literal> or leaving out the second argument
+    returns the size of the main data fork of the relation.
+    Specifying <literal>'fsm'</literal> returns the size of the Free Space
+    Map (see <xref linkend="storage-fsm">) associated with the relation.
+    Specifying <literal>'vm'</literal> returns the size of the Visibility
+    Map (see <xref linkend="storage-vm">) associated with the relation.
+    Specifying <literal>'init'</literal> returns the size of the
+    initialization fork, if any, associated with the relation.
+    Note that this function shows the size of only one fork;
     for most purposes it is more convenient to use the higher-level
     functions <function>pg_total_relation_size</> or
     <function>pg_table_size</>.
 
@@ -16,7 +16,6 @@
 
 #include "catalog/catalog.h"
 #include "catalog/storage_xlog.h"
-#include "common/relpath.h"
 
 
 void
 
@@ -16,7 +16,6 @@
 
 #include "access/xact.h"
 #include "catalog/catalog.h"
-#include "common/relpath.h"
 #include "storage/sinval.h"
 #include "utils/timestamp.h"
 
 
@@ -17,7 +17,6 @@
 #include "access/xlog.h"
 #include "access/xlog_internal.h"
 #include "catalog/pg_control.h"
-#include "common/relpath.h"
 #include "utils/guc.h"
 #include "utils/timestamp.h"
 
 
@@ -20,7 +20,6 @@
 #include "access/xlog.h"
 #include "access/xlogutils.h"
 #include "catalog/catalog.h"
-#include "common/relpath.h"
 #include "storage/smgr.h"
 #include "utils/guc.h"
 #include "utils/hsearch.h"
 
@@ -37,64 +37,13 @@
 #include "catalog/pg_shseclabel.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/toasting.h"
-#include "common/relpath.h"
 #include "miscadmin.h"
 #include "storage/fd.h"
 #include "utils/fmgroids.h"
 #include "utils/rel.h"
 #include "utils/tqual.h"
 
 
-
-/*
- * forkname_to_number - look up fork number by name
- */
-ForkNumber
-forkname_to_number(char *forkName)
-{
-	ForkNumber	forkNum;
-
-	for (forkNum = 0; forkNum <= MAX_FORKNUM; forkNum++)
-		if (strcmp(forkNames[forkNum], forkName) == 0)
-			return forkNum;
-
-	ereport(ERROR,
-			(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-			 errmsg("invalid fork name"),
-			 errhint("Valid fork names are \"main\", \"fsm\", and \"vm\".")));
-	return InvalidForkNumber;	/* keep compiler quiet */
-}
-
-/*
- * GetDatabasePath			- construct path to a database dir
- *
- * Result is a palloc'd string.
- *
- * XXX this must agree with relpath()!
- */
-char *
-GetDatabasePath(Oid dbNode, Oid spcNode)
-{
-	if (spcNode == GLOBALTABLESPACE_OID)
-	{
-		/* Shared system relations live in {datadir}/global */
-		Assert(dbNode == 0);
-		return pstrdup("global");
-	}
-	else if (spcNode == DEFAULTTABLESPACE_OID)
-	{
-		/* The default tablespace is {datadir}/base */
-		return psprintf("base/%u", dbNode);
-	}
-	else
-	{
-		/* All other tablespaces are accessed via symlinks */
-		return psprintf("pg_tblspc/%u/%s/%u",
-						spcNode, TABLESPACE_VERSION_DIRECTORY, dbNode);
-	}
-}
-
-
 /*
  * IsSystemRelation
  *		True iff the relation is either a system catalog or toast table.
 
@@ -51,7 +51,6 @@
 #include "commands/tablespace.h"
 #include "commands/trigger.h"
 #include "commands/typecmds.h"
-#include "common/relpath.h"
 #include "executor/executor.h"
 #include "foreign/foreign.h"
 #include "miscadmin.h"
 
@@ -68,7 +68,6 @@
 #include "commands/tablecmds.h"
 #include "commands/tablespace.h"
 #include "commands/user.h"
-#include "common/relpath.h"
 #include "miscadmin.h"
 #include "postmaster/bgwriter.h"
 #include "storage/fd.h"
@@ -278,11 +277,11 @@ CreateTableSpace(CreateTableSpaceStmt *stmt)
 
 	/*
 	 * Check that location isn't too long. Remember that we're going to append
-	 * 'PG_XXX/<dboid>/<relid>.<nnn>'.	FYI, we never actually reference the
-	 * whole path, but mkdir() uses the first two parts.
+	 * 'PG_XXX/<dboid>/<relid>_<fork>.<nnn>'.  FYI, we never actually
+	 * reference the whole path here, but mkdir() uses the first two parts.
 	 */
 	if (strlen(location) + 1 + strlen(TABLESPACE_VERSION_DIRECTORY) + 1 +
-		OIDCHARS + 1 + OIDCHARS + 1 + OIDCHARS > MAXPGPATH)
+		OIDCHARS + 1 + OIDCHARS + 1 + FORKNAMECHARS + 1 + OIDCHARS > MAXPGPATH)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
 				 errmsg("tablespace location \"%s\" is too long",
 
@@ -18,8 +18,8 @@
 #include <time.h>
 
 #include "access/xlog_internal.h"		/* for pg_start/stop_backup */
+#include "catalog/catalog.h"
 #include "catalog/pg_type.h"
-#include "common/relpath.h"
 #include "lib/stringinfo.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 
@@ -50,28 +50,20 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "miscadmin.h"
-
 #include "access/rewriteheap.h"
 #include "access/transam.h"
 #include "access/tuptoaster.h"
 #include "access/xact.h"
-
 #include "catalog/catalog.h"
-
-#include "common/relpath.h"
-
 #include "lib/binaryheap.h"
-
+#include "miscadmin.h"
 #include "replication/logical.h"
 #include "replication/reorderbuffer.h"
 #include "replication/slot.h"
 #include "replication/snapbuild.h" /* just for SnapBuildSnapDecRefcount */
-
 #include "storage/bufmgr.h"
 #include "storage/fd.h"
 #include "storage/sinval.h"
-
 #include "utils/builtins.h"
 #include "utils/combocid.h"
 #include "utils/memdebug.h"
@@ -80,6 +72,7 @@
 #include "utils/relfilenodemap.h"
 #include "utils/tqual.h"
 
+
 /* entry for a hash table we use to map from xid to our transaction state */
 typedef struct ReorderBufferTXNByIdEnt
 {
 
@@ -35,7 +35,6 @@
 
 #include "catalog/catalog.h"
 #include "catalog/storage.h"
-#include "common/relpath.h"
 #include "executor/instrument.h"
 #include "miscadmin.h"
 #include "pg_trace.h"
 
@@ -16,7 +16,6 @@
 #include "postgres.h"
 
 #include "catalog/catalog.h"
-#include "common/relpath.h"
 #include "executor/instrument.h"
 #include "storage/buf_internals.h"
 #include "storage/bufmgr.h"
 
@@ -71,7 +71,6 @@
 #include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/pg_tablespace.h"
-#include "common/relpath.h"
 #include "pgstat.h"
 #include "storage/fd.h"
 #include "storage/ipc.h"
 
@@ -28,7 +28,6 @@
 #include "miscadmin.h"
 #include "access/xlog.h"
 #include "catalog/catalog.h"
-#include "common/relpath.h"
 #include "portability/instr_time.h"
 #include "postmaster/bgwriter.h"
 #include "storage/fd.h"
 
@@ -21,7 +21,6 @@
 #include "catalog/pg_tablespace.h"
 #include "commands/dbcommands.h"
 #include "commands/tablespace.h"
-#include "common/relpath.h"
 #include "miscadmin.h"
 #include "storage/fd.h"
 #include "utils/acl.h"
 
@@ -25,7 +25,6 @@
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_type.h"
 #include "commands/dbcommands.h"
-#include "common/relpath.h"
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "parser/keywords.h"
 
@@ -56,7 +56,6 @@
 #include "catalog/schemapg.h"
 #include "catalog/storage.h"
 #include "commands/trigger.h"
-#include "common/relpath.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
 #include "optimizer/planmain.h"