From: Fujii Masao <fujii@postgresql.org>
Date: Mon, 11 Aug 2014 14:19:23 +0000 (+0900)
Subject: Fix failure to follow the directions when "init" fork was added.
X-Git-Tag: REL9_1_15~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b1812b8132006576cd303327e6e39d809afb5b6;p=postgresql

Fix failure to follow the directions when "init" fork was added.

Specifically this commit updates forkname_to_number() so that the HINT
message includes "init" fork, and also adds the description of "init" fork
into pg_relation_size() document.

This is a part of the commit 2d00190495b22e0d0ba351b2cda9c95fb2e3d083
which has fixed the same oversight in master and 9.4. Back-patch to
9.1 where "init" fork was added.
---

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index f1ae736ef3..82238f7008 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -14400,7 +14400,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>
@@ -14521,6 +14521,12 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
        (see <xref linkend="storage-vm">) associated with the relation.
       </para>
      </listitem>
+     <listitem>
+      <para>
+       <literal>'init'</literal> returns the size of the initialization fork,
+       if any, (see <xref linkend="storage-init">) associated with the relation.
+      </para>
+     </listitem>
     </itemizedlist>
    </para>
 
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 03799b5ba6..79c1a1d01d 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -74,7 +74,8 @@ forkname_to_number(char *forkName)
 	ereport(ERROR,
 			(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 			 errmsg("invalid fork name"),
-			 errhint("Valid fork names are \"main\", \"fsm\", and \"vm\".")));
+			 errhint("Valid fork names are \"main\", \"fsm\", "
+					 "\"vm\", and \"init\".")));
 	return InvalidForkNumber;	/* keep compiler quiet */
 }