This is an automated email from the ASF dual-hosted git repository. maxyang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 0f55f1c804d0cd3141b82fb196ad6a79c8f78298 Author: wenru yan <[email protected]> AuthorDate: Thu Mar 7 06:27:56 2024 +0000 Remove GPDB_96_MERGE_FIXME in portalmem.c commit c5454f9 add deteled comment and commit 41baee7 remove the comment. Currently, every MarkPortalActive() caller ensures it updates the portal status again before relinquishing control. When using an upper-level portal in a subtransaction, change to PORTAL_READY or when error happens change to PORTAL_FAILED, so ACTIVE can't happen here. --- src/backend/utils/mmgr/portalmem.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index c8c8c314be..44c004f7b8 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -1044,13 +1044,6 @@ AtSubAbort_Portals(SubTransactionId mySubid, portal->activeSubid = parentSubid; /* - * GPDB_96_MERGE_FIXME: We had this different comment here in GPDB. - * Does this scenario happen in GPDB for some reason? - * - * Upper-level portals that failed while running in this - * subtransaction must be forced into FAILED state, for the - * same reasons discussed below. - * * A MarkPortalActive() caller ran an upper-level portal in * this subtransaction and left the portal ACTIVE. This can't * happen, but force the portal into FAILED state for the same --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
