Merge branch 'PGPROEE9_6_atx' into PGPROEE9_6_ALPHA

Author: dmpgpro

src/backend/access/transam/xact.c

@@ -1854,6 +1854,8 @@ typedef struct {
 	void *SPIState;
 	void *SnapshotState;
 	struct TransInvalidationInfo* InvalidationInfo;
+
+	List *on_commit_actions;
 } SuspendedTransactionState;
 
 static int suspendedXactNum = 0;
@@ -2209,8 +2211,10 @@ CommitTransaction(void)
 	AtEOXact_Namespace(true, is_parallel_worker);
 	AtEOXact_SMgr();
 	if (getNestLevelATX() == 0) 
+	{
 		AtEOXact_Files();
-	AtEOXact_ComboCid();
+		AtEOXact_ComboCid();
+	}
 	AtEOXact_HashTables(true);
 	AtEOXact_PgStat(true);
 	AtEOXact_Snapshot(true);
@@ -3581,9 +3585,11 @@ void SuspendTransaction(void)
 		MOVELEFT(sus->vxid.backendId, MyProc->backendId, MyBackendId);
 		MOVELEFT(sus->vxid.localTransactionId, MyProc->lxid, GetNextLocalTransactionId());
 
+		MOVELEFT(sus->on_commit_actions, pg_on_commit_actions, NULL);
+
 		sus->PgStatState = PgStatSuspend();
 		sus->TriggerState = TriggerSuspend();
-		sus->SPIState = SuspendSPI();
+		sus->SPIState = SuspendSPI();	  
 	}
 
 	AtStart_Memory();
@@ -3653,6 +3659,8 @@ bool ResumeTransaction(void)
 
 		MyProc->backendId = sus->vxid.backendId;
 		MyProc->lxid = sus->vxid.localTransactionId;
+
+		pg_on_commit_actions = sus->on_commit_actions;
 	}
 
 	ResumePgXact(MyPgXact);

src/backend/commands/tablecmds.c

@@ -118,7 +118,7 @@ typedef struct OnCommitItem
 	SubTransactionId deleting_subid;
 } OnCommitItem;
 
-static List *on_commits = NIL;
+List* pg_on_commit_actions = NIL;
 
 
 /*
@@ -11985,7 +11985,7 @@ register_on_commit_action(Oid relid, OnCommitAction action)
 	oc->creating_subid = GetCurrentSubTransactionId();
 	oc->deleting_subid = InvalidSubTransactionId;
 
-	on_commits = lcons(oc, on_commits);
+	pg_on_commit_actions = lcons(oc, pg_on_commit_actions);
 
 	MemoryContextSwitchTo(oldcxt);
 }
@@ -12000,7 +12000,7 @@ remove_on_commit_action(Oid relid)
 {
 	ListCell   *l;
 
-	foreach(l, on_commits)
+	foreach(l, pg_on_commit_actions)
 	{
 		OnCommitItem *oc = (OnCommitItem *) lfirst(l);
 
@@ -12024,7 +12024,7 @@ PreCommit_on_commit_actions(void)
 	ListCell   *l;
 	List	   *oids_to_truncate = NIL;
 
-	foreach(l, on_commits)
+	foreach(l, pg_on_commit_actions)
 	{
 		OnCommitItem *oc = (OnCommitItem *) lfirst(l);
 
@@ -12096,7 +12096,7 @@ AtEOXact_on_commit_actions(bool isCommit)
 	ListCell   *prev_item;
 
 	prev_item = NULL;
-	cur_item = list_head(on_commits);
+	cur_item = list_head(pg_on_commit_actions);
 
 	while (cur_item != NULL)
 	{
@@ -12106,12 +12106,12 @@ AtEOXact_on_commit_actions(bool isCommit)
 			oc->creating_subid != InvalidSubTransactionId)
 		{
 			/* cur_item must be removed */
-			on_commits = list_delete_cell(on_commits, cur_item, prev_item);
+			pg_on_commit_actions = list_delete_cell(pg_on_commit_actions, cur_item, prev_item);
 			pfree(oc);
 			if (prev_item)
 				cur_item = lnext(prev_item);
 			else
-				cur_item = list_head(on_commits);
+				cur_item = list_head(pg_on_commit_actions);
 		}
 		else
 		{
@@ -12139,7 +12139,7 @@ AtEOSubXact_on_commit_actions(bool isCommit, SubTransactionId mySubid,
 	ListCell   *prev_item;
 
 	prev_item = NULL;
-	cur_item = list_head(on_commits);
+	cur_item = list_head(pg_on_commit_actions);
 
 	while (cur_item != NULL)
 	{
@@ -12148,12 +12148,12 @@ AtEOSubXact_on_commit_actions(bool isCommit, SubTransactionId mySubid,
 		if (!isCommit && oc->creating_subid == mySubid)
 		{
 			/* cur_item must be removed */
-			on_commits = list_delete_cell(on_commits, cur_item, prev_item);
+			pg_on_commit_actions = list_delete_cell(pg_on_commit_actions, cur_item, prev_item);
 			pfree(oc);
 			if (prev_item)
 				cur_item = lnext(prev_item);
 			else
-				cur_item = list_head(on_commits);
+				cur_item = list_head(pg_on_commit_actions);
 		}
 		else
 		{

src/include/commands/tablecmds.h

@@ -21,6 +21,7 @@
 #include "storage/lock.h"
 #include "utils/relcache.h"
 
+extern List* pg_on_commit_actions;
 
 extern ObjectAddress DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 			   ObjectAddress *typaddress);

src/pl/plpgsql/src/pl_exec.c

@@ -1171,6 +1171,7 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 		MemoryContext oldcontext = CurrentMemoryContext;
 		ExprContext *old_eval_econtext = estate->eval_econtext;
 		ErrorData  *save_cur_error = estate->cur_error;
+		bool error_inside_commit = false;
 
 		estate->err_text = gettext_noop("during autonomous statement block entry");
 
@@ -1209,6 +1210,7 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 
 			old_shared_estate = shared_simple_eval_estate;
 			shared_simple_eval_estate = NULL;
+			error_inside_commit = true;
 			CommitTransactionCommand();
 			shared_simple_eval_estate = old_shared_estate;
 
@@ -1230,13 +1232,16 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 			edata = CopyErrorData();
 			FlushErrorState();
 
-			plpgsql_destroy_econtext(estate);
-
-			old_shared_estate = shared_simple_eval_estate;
-			shared_simple_eval_estate = NULL;
+			if (!error_inside_commit)
+			{
+				plpgsql_destroy_econtext(estate);
+				
+				old_shared_estate = shared_simple_eval_estate;
+				shared_simple_eval_estate = NULL;
+			}
 			AbortCurrentTransaction();
 			shared_simple_eval_estate = old_shared_estate;
-
+			
 			estate->eval_econtext = old_eval_econtext;
 
 			if (block->exceptions)