Merge branch 'PGPROEE9_6_atx_fix' into PGPROEE9_6

Author: vbwagner

src/backend/access/transam/xact.c

@@ -294,6 +294,8 @@ typedef struct SubXactCallbackItem
 
 static SubXactCallbackItem *SubXact_callbacks = NULL;
 
+static bool	xactHasCatcacheInvalidationMessages;
+static bool xactHasRelcacheInvalidationMessages;
 
 /* local function prototypes */
 static void AssignTransactionId(TransactionState s);
@@ -1850,7 +1852,9 @@ typedef struct {
 	void *TriggerState;
 	void *SPIState;
 	void *SnapshotState;
+	struct TransInvalidationInfo* InvalidationInfo;
 } SuspendedTransactionState;
+
 static int suspendedXactNum = 0;
 static SuspendedTransactionState suspendedXacts[MAX_SUSPENDED_XACTS];
 
@@ -2168,6 +2172,8 @@ CommitTransaction(void)
 	 * waiting for lock on a relation we've modified, we want them to know
 	 * about the catalog change before they start using the relation).
 	 */
+	xactHasCatcacheInvalidationMessages = HasCatcacheInvalidationMessages(); 
+	xactHasRelcacheInvalidationMessages = HasRelcacheInvalidationMessages();
 	AtEOXact_Inval(true);
 
 	AtEOXact_MultiXact();
@@ -2662,6 +2668,8 @@ AbortTransaction(void)
 			AtEOXact_Buffers(false);
 		}
 		AtEOXact_RelationCache(false);
+		xactHasCatcacheInvalidationMessages = HasCatcacheInvalidationMessages(); 
+		xactHasRelcacheInvalidationMessages = HasRelcacheInvalidationMessages();
 		AtEOXact_Inval(false);
 		AtEOXact_MultiXact();
 		ResourceOwnerRelease(TopTransactionResourceOwner,
@@ -3504,7 +3512,20 @@ void SuspendTransaction(void)
 		SuspendedTransactionState *sus = suspendedXacts + suspendedXactNum++;
 
 		sus->TopTransactionStateData = TopTransactionStateData;
+
 		sus->SnapshotState = SuspendSnapshot(); /* only before the resource-owner stuff */
+		
+		if (HasCatcacheInvalidationMessages()) 
+		{
+			ResetCatalogCaches();
+		}
+		if (HasRelcacheInvalidationMessages()) 
+		{
+			RelationCacheInvalidate();			
+		}
+		sus->InvalidationInfo = SuspendInvalidationInfo();
+		xactHasCatcacheInvalidationMessages = false;
+		xactHasRelcacheInvalidationMessages = false;
 
 		tts = &TopTransactionStateData;
 		tts->state = TRANS_INPROGRESS;
@@ -3545,7 +3566,6 @@ void SuspendTransaction(void)
 		MOVELEFT(sus->CurTransactionContext, CurTransactionContext, NULL);
 		MOVELEFT(sus->TransactionAbortContext, TransactionAbortContext, NULL);
 
-		MemoryContextSwitchTo(CurTransactionContext);
 		MOVELEFT(sus->CurrentResourceOwner, CurrentResourceOwner, NULL);
 		MOVELEFT(sus->CurTransactionResourceOwner, CurTransactionResourceOwner, NULL);
 		MOVELEFT(sus->TopTransactionResourceOwner, TopTransactionResourceOwner, NULL);
@@ -3602,17 +3622,26 @@ bool ResumeTransaction(void)
 		prepareGID = sus->prepareGID;
 		forceSyncCommit = sus->forceSyncCommit;
 
+		MemoryContextDelete(TransactionAbortContext);
+
 		TopTransactionContext = sus->TopTransactionContext;
 		CurTransactionContext = sus->CurTransactionContext;
 		TransactionAbortContext = sus->TransactionAbortContext;
 
-		//MemoryContextSwitchTo(CurTransactionContext);
 		CurrentResourceOwner = sus->CurrentResourceOwner;
-		Assert(*(unsigned long long*)CurrentResourceOwner != 0x7f7f7f7f7f7f7f7f);
 		CurTransactionResourceOwner = sus->CurTransactionResourceOwner;
 		TopTransactionResourceOwner = sus->TopTransactionResourceOwner;
 
 		ResumeSnapshot(sus->SnapshotState); /* only after the resource-owner stuff */
+		ResumeInvalidationInfo(sus->InvalidationInfo);
+		if (xactHasCatcacheInvalidationMessages) 
+		{
+			ResetCatalogCaches();
+		}
+		if (xactHasRelcacheInvalidationMessages) 
+		{
+			RelationCacheInvalidate();			
+		}
 
 		MyProc->backendId = sus->vxid.backendId;
 		MyProc->lxid = sus->vxid.localTransactionId;

src/backend/utils/cache/inval.c

@@ -841,6 +841,32 @@ xactGetCommittedInvalidationMessages(SharedInvalidationMessage **msgs,
 	return numSharedInvalidMessagesArray;
 }
 
+bool HasCatcacheInvalidationMessages(void)
+{
+	return transInvalInfo != NULL 
+		&& (transInvalInfo->CurrentCmdInvalidMsgs.cclist != NULL
+			|| transInvalInfo->PriorCmdInvalidMsgs.cclist != NULL);
+}
+
+bool HasRelcacheInvalidationMessages(void)
+{
+	return transInvalInfo != NULL 
+		&& (transInvalInfo->CurrentCmdInvalidMsgs.rclist != NULL
+			|| transInvalInfo->PriorCmdInvalidMsgs.rclist != NULL);
+}
+
+struct TransInvalidationInfo* SuspendInvalidationInfo()
+{
+	TransInvalidationInfo* state = transInvalInfo;
+	transInvalInfo = NULL;
+	return state;
+}
+
+void ResumeInvalidationInfo(struct TransInvalidationInfo* inval)
+{
+	transInvalInfo = inval;
+}
+
 /*
  * ProcessCommittedInvalidationMessages is executed by xact_redo_commit() or
  * standby_redo() to process invalidation messages. Currently that happens

src/backend/utils/resowner/resowner.c

@@ -21,6 +21,7 @@
 #include "postgres.h"
 
 #include "access/hash.h"
+#include "access/xact.h"
 #include "storage/predicate.h"
 #include "storage/proc.h"
 #include "utils/memutils.h"
@@ -555,7 +556,7 @@ ResourceOwnerReleaseInternal(ResourceOwner owner,
 	}
 	else if (phase == RESOURCE_RELEASE_LOCKS)
 	{
-		if (isTopLevel)
+		if (isTopLevel && getNestLevelATX() == 0)
 		{
 			/*
 			 * For a top-level xact we are going to release all locks (or at
@@ -578,7 +579,7 @@ ResourceOwnerReleaseInternal(ResourceOwner owner,
 			LOCALLOCK **locks;
 			int			nlocks;
 
-			Assert(owner->parent != NULL);
+			//Assert(owner->parent != NULL);
 
 			/*
 			 * Pass the list of locks owned by this resource owner to the lock
@@ -595,7 +596,7 @@ ResourceOwnerReleaseInternal(ResourceOwner owner,
 				nlocks = owner->nlocks;
 			}
 
-			if (isCommit)
+			if (isCommit && !isTopLevel)
 				LockReassignCurrentOwner(locks, nlocks);
 			else
 				LockReleaseCurrentOwner(locks, nlocks);

src/backend/utils/time/snapmgr.c

@@ -2176,9 +2176,6 @@ void *SuspendSnapshot(void)
 	MOVELEFT(s->ActiveSnapshot, ActiveSnapshot, NULL);
 	MOVELEFT(s->OldestActiveSnapshot, OldestActiveSnapshot, NULL);
 
-	RelationCacheInvalidate();
-	ResetCatalogCaches();
-
 	return s;
 }
 
@@ -2191,6 +2188,13 @@ void ResumeSnapshot(void *data)
 	//UnregisterSnapshot(CatalogSnapshot);
 	//UnregisterSnapshot(HistoricSnapshot);
 
+	free(CurrentSnapshotData.xip);
+	free(CurrentSnapshotData.subxip);
+	free(SecondarySnapshotData.xip);
+	free(SecondarySnapshotData.subxip);
+	free(CatalogSnapshotData.xip);
+	free(CatalogSnapshotData.subxip);
+
 	CurrentSnapshotData = s->CurrentSnapshotData;
 	SecondarySnapshotData = s->SecondarySnapshotData;
 	CatalogSnapshotData = s->CatalogSnapshotData;
@@ -2207,8 +2211,5 @@ void ResumeSnapshot(void *data)
 	ActiveSnapshot = s->ActiveSnapshot;
 	OldestActiveSnapshot = s->OldestActiveSnapshot;
 
-	RelationCacheInvalidate();
-	ResetCatalogCaches();
-
 	free(s);
 }

src/include/utils/inval.h

@@ -61,4 +61,14 @@ extern void CacheRegisterRelcacheCallback(RelcacheCallbackFunction func,
 extern void CallSyscacheCallbacks(int cacheid, uint32 hashvalue);
 
 extern void InvalidateSystemCaches(void);
+
+/* Funcitons below are needed to support ATX */
+
+struct TransInvalidationInfo;
+
+extern bool HasCatcacheInvalidationMessages(void);
+extern bool HasRelcacheInvalidationMessages(void);
+extern struct TransInvalidationInfo* SuspendInvalidationInfo(void);
+extern void ResumeInvalidationInfo(struct TransInvalidationInfo* inval);
+
 #endif   /* INVAL_H */