From 867cc7b6ddb9d998103688a56048fe9a1ddd972a Mon Sep 17 00:00:00 2001 From: Alexander Korotkov Date: Tue, 2 Apr 2024 11:26:59 +0300 Subject: Revert "Custom reloptions for table AM" This reverts commit c95c25f9af4bc77f2f66a587735c50da08c12b37 due to multiple design issues spotted after commit. Reported-by: Jeff Davis Discussion: https://postgr.es/m/11550b536211d5748bb2865ed6cb3502ff073bf7.camel%40j-davis.com --- src/backend/access/common/reloptions.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/backend/access/common/reloptions.c') diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 963995388bb..d6eb5d85599 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -24,7 +24,6 @@ #include "access/nbtree.h" #include "access/reloptions.h" #include "access/spgist_private.h" -#include "access/tableam.h" #include "catalog/pg_type.h" #include "commands/defrem.h" #include "commands/tablespace.h" @@ -1378,7 +1377,7 @@ untransformRelOptions(Datum options) */ bytea * extractRelOptions(HeapTuple tuple, TupleDesc tupdesc, - const TableAmRoutine *tableam, amoptions_function amoptions) + amoptions_function amoptions) { bytea *options; bool isnull; @@ -1400,8 +1399,7 @@ extractRelOptions(HeapTuple tuple, TupleDesc tupdesc, case RELKIND_RELATION: case RELKIND_TOASTVALUE: case RELKIND_MATVIEW: - options = tableam_reloptions(tableam, classForm->relkind, - datum, false); + options = heap_reloptions(classForm->relkind, datum, false); break; case RELKIND_PARTITIONED_TABLE: options = partitioned_table_reloptions(datum, false); -- cgit v1.2.3