Adjust the order of the prechecks in pgrowlocks()
authorDavid Rowley <drowley@postgresql.org>
Tue, 31 Oct 2023 03:43:01 +0000 (16:43 +1300)
committerDavid Rowley <drowley@postgresql.org>
Tue, 31 Oct 2023 03:43:01 +0000 (16:43 +1300)
commit1360683530a67a6e494412c1cc16a6ad00e8e2f9
treea40143c0b7a4251f1e349eebcbd87a069809aa3b
parente633e9b132ffda7f4afd9248c7385bdd282d32d4
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.
contrib/pgrowlocks/pgrowlocks.c