Thread: pgsql: Adjust the order of the prechecks in pgrowlocks()

pgsql: Adjust the order of the prechecks in pgrowlocks()

From
David Rowley
Date:
Adjust the order of the prechecks in pgrowlocks()

4b8266415 added a precheck to pgrowlocks() to ensure the given object's
pg_class.relam is HEAP_TABLE_AM_OID, however, that check was put before
another check which was checking if the given object was a partitioned
table.  Since the pg_class.relam is always InvalidOid for partitioned
tables, if pgrowlocks() was called passing a partitioned table, then the
"only heap AM is supported" error would be raised instead of the intended
error about the given object being a partitioned table.

Here we simply move the pg_class.relam check to after the check that
verifies that we are in fact working with a normal (non-partitioned)
table.

Reported-by: jian he
Discussion: https://postgr.es/m/CACJufxFaSp_WguFCf0X98951zFVX+dXFnF1mxAb-G3g1HiHOow@mail.gmail.com
Backpatch-through: 12, where 4b8266415 was introduced.

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/73635b6d63b5e12ea5f8b44a0154440654819820

Modified Files
--------------
contrib/pgrowlocks/pgrowlocks.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)