From 3e0d4db5b5bf318bb01ffa34d744038e6807398f Mon Sep 17 00:00:00 2001 From: reshke Date: Tue, 14 Jan 2025 21:02:20 +0000 Subject: [PATCH] Fix cherry-pick issues --- src/backend/access/common/reloptions_gp.c | 4 +++- src/backend/commands/tablecmds.c | 2 +- src/backend/commands/trigger.c | 2 +- src/include/catalog/pg_am.h | 4 ---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/backend/access/common/reloptions_gp.c b/src/backend/access/common/reloptions_gp.c index 146962d4f62..b6022e1ccc4 100644 --- a/src/backend/access/common/reloptions_gp.c +++ b/src/backend/access/common/reloptions_gp.c @@ -727,7 +727,9 @@ reloption_is_default(const char *optstr, int optlen) else res = false; - pfree(defaultopt); + if (defaultopt) + pfree(defaultopt); + return res; } diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 68a4b8dea59..8002afdda02 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -16176,7 +16176,7 @@ ATExecSetRelOptions(Relation rel, List *defList, AlterTableType operation, if ((RelationIsAppendOptimized(rel) && !am_change_heap_ao) || (!RelationIsAppendOptimized(rel) && am_change_heap_ao)) { - StdRdOptions *stdRdOptions = (StdRdOptions *) table_reloptions(rel->rd_tableam->amoptions, newOptions, rel->rd_rel->relkind, true); + StdRdOptions *stdRdOptions = (StdRdOptions *) default_reloptions(newOptions, true, RELOPT_KIND_APPENDOPTIMIZED); validateAppendOnlyRelOptions(stdRdOptions->blocksize, gp_safefswritesize, stdRdOptions->compresslevel, diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index fad11f96337..43d723aed5f 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -1712,7 +1712,7 @@ EnableDisableTriggerNew(Relation rel, const char *tgname, rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE && (TRIGGER_FOR_ROW(oldtrig->tgtype))) { - PartitionDesc partdesc = RelationGetPartitionDesc(rel); + PartitionDesc partdesc = RelationGetPartitionDesc(rel, false); int i; for (i = 0; i < partdesc->nparts; i++) diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h index d4bbbe58d4c..02466691e63 100644 --- a/src/include/catalog/pg_am.h +++ b/src/include/catalog/pg_am.h @@ -21,10 +21,6 @@ #include "catalog/genbki.h" #include "catalog/pg_am_d.h" -/* GPDB: convenient macro for checking AO AMs */ -#define IsAccessMethodAO(am_oid) \ - ((am_oid) == AO_ROW_TABLE_AM_OID || (am_oid) == AO_COLUMN_TABLE_AM_OID) - /* ---------------- * pg_am definition. cpp turns this into * typedef struct FormData_pg_am