NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit1360683

committed

Adjust the order of the prechecks in pgrowlocks()

4b82664 added a precheck to pgrowlocks() to ensure the given object'spg_class.relam is HEAP_TABLE_AM_OID, however, that check was put beforeanother check which was checking if the given object was a partitionedtable. Since the pg_class.relam is always InvalidOid for partitionedtables, if pgrowlocks() was called passing a partitioned table, then the"only heap AM is supported" error would be raised instead of the intendederror about the given object being a partitioned table.Here we simply move the pg_class.relam check to after the check thatverifies that we are in fact working with a normal (non-partitioned)table.Reported-by: jian heDiscussion:https://postgr.es/m/CACJufxFaSp_WguFCf0X98951zFVX+dXFnF1mxAb-G3g1HiHOow@mail.gmail.comBackpatch-through: 12, where4b82664 was introduced.

1 parente633e9b commit1360683Copy full SHA for 1360683

File tree

1 file changed

-4

lines changed

contrib/pgrowlocks
- pgrowlocks.c

1 file changed

-4

lines changed

`‎contrib/pgrowlocks/pgrowlocks.c‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,6 @@ pgrowlocks(PG_FUNCTION_ARGS)`
`81`	`81`	`relrv=makeRangeVarFromNameList(textToQualifiedNameList(relname));`
`82`	`82`	`rel=relation_openrv(relrv,AccessShareLock);`
`83`	`83`
`84`		`-if (rel->rd_rel->relam!=HEAP_TABLE_AM_OID)`
`85`		`-ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`86`		`-errmsg("only heap AM is supported")));`
`87`		`-`
`88`	`84`	`if (rel->rd_rel->relkind==RELKIND_PARTITIONED_TABLE)`
`89`	`85`	`ereport(ERROR,`
`90`	`86`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`@@ -96,6 +92,10 @@ pgrowlocks(PG_FUNCTION_ARGS)`
`96`	`92`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`97`	`93`	`errmsg("\"%s\" is not a table",`
`98`	`94`	`RelationGetRelationName(rel))));`
	`95`	`+elseif (rel->rd_rel->relam!=HEAP_TABLE_AM_OID)`
	`96`	`+ereport(ERROR,`
	`97`	`+(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
	`98`	`+errmsg("only heap AM is supported")));`
`99`	`99`
`100`	`100`	`/*`
`101`	`101`	`* check permissions: must have SELECT on table or be in`

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!

Commit1360683

File tree

1 file changed

1 file changed

`‎contrib/pgrowlocks/pgrowlocks.c‎`

0 commit comments