NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit054fc30

committed

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

Specifically this commit updates forkname_to_number() so that the HINTmessage includes "init" fork, and also adds the description of "init" forkinto pg_relation_size() document.This is a part of the commit2d00190which has fixed the same oversight in master and 9.4. Back-patch to9.1 where "init" fork was added.

1 parent84317b0 commit054fc30Copy full SHA for 054fc30

File tree

2 files changed

-2

lines changed

doc/src/sgml
- func.sgml
src/backend/catalog
- catalog.c

2 files changed

-2

lines changed

`‎doc/src/sgml/func.sgml`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14991,7 +14991,7 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());`
`14991`	`14991`	`<entry><type>bigint</type></entry>`
`14992`	`14992`	`<entry>`
`14993`	`14993`	`Disk space used by the specified fork (<literal>'main'</literal>,`
`14994`		`- <literal>'fsm'</literal>or <literal>'vm'</>)`
	`14994`	`+ <literal>'fsm'</literal>, <literal>'vm'</>,or <literal>'init'</>)`
`14995`	`14995`	`of the specified table or index`
`14996`	`14996`	`</entry>`
`14997`	`14997`	`</row>`
`@@ -15125,6 +15125,12 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());`
`15125`	`15125`	`(see <xref linkend="storage-vm">) associated with the relation.`
`15126`	`15126`	`</para>`
`15127`	`15127`	`</listitem>`
	`15128`	`+ <listitem>`
	`15129`	`+ <para>`
	`15130`	`+ <literal>'init'</literal> returns the size of the initialization fork,`
	`15131`	`+ if any, (see <xref linkend="storage-init">) associated with the relation.`
	`15132`	`+ </para>`
	`15133`	`+ </listitem>`
`15128`	`15134`	`</itemizedlist>`
`15129`	`15135`	`</para>`
`15130`	`15136`

`‎src/backend/catalog/catalog.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ forkname_to_number(char *forkName)`
`75`	`75`	`ereport(ERROR,`
`76`	`76`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`77`	`77`	`errmsg("invalid fork name"),`
`78`		`-errhint("Valid fork names are \"main\", \"fsm\", and \"vm\".")));`
	`78`	`+errhint("Valid fork names are \"main\", \"fsm\", "`
	`79`	`+"\"vm\", and \"init\".")));`
`79`	`80`	`returnInvalidForkNumber;/* keep compiler quiet */`
`80`	`81`	`}`
`81`	`82`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit054fc30

File tree

2 files changed

2 files changed

`‎doc/src/sgml/func.sgml`

`‎src/backend/catalog/catalog.c`

0 commit comments