Fix releasing ATX locks

knizhnik · knizhnik · commit 06771289f694 · 2017-02-22T20:33:43.000+03:00
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -3545,7 +3545,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);
@@ -3606,9 +3605,7 @@ bool ResumeTransaction(void)
 		CurTransactionContext = sus->CurTransactionContext;
 		TransactionAbortContext = sus->TransactionAbortContext;
 
-		//MemoryContextSwitchTo(CurTransactionContext);
 		CurrentResourceOwner = sus->CurrentResourceOwner;
-		Assert(*(unsigned long long*)CurrentResourceOwner != 0x7f7f7f7f7f7f7f7f);
 		CurTransactionResourceOwner = sus->CurTransactionResourceOwner;
 		TopTransactionResourceOwner = sus->TopTransactionResourceOwner;
 
diff --git a/src/backend/utils/resowner/resowner.c b/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);
