Fix predicate locks for serializable autonomous transactions

knizhnik · knizhnik · commit cd7a710f3293 · 2017-11-01T19:22:08.000+03:00
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -1855,6 +1855,7 @@ typedef struct {
 	void *TriggerState;
 	void *SPIState;
 	void *SnapshotState;
+	void *PredicateState;
 	struct TransInvalidationInfo* InvalidationInfo;
 
 	List *on_commit_actions;
@@ -3530,6 +3531,7 @@ void SuspendTransaction(void)
 		sus->TopTransactionStateData = TopTransactionStateData;
 
 		sus->SnapshotState = SuspendSnapshot(); /* only before the resource-owner stuff */
+		sus->PredicateState = SuspendPredicate();
 		
 		if (HasCatcacheInvalidationMessages()) 
 		{
@@ -3652,6 +3654,7 @@ bool ResumeTransaction(void)
 		TopTransactionResourceOwner = sus->TopTransactionResourceOwner;
 
 		ResumeSnapshot(sus->SnapshotState); /* only after the resource-owner stuff */
+		ResumePredicate(sus->PredicateState);
 		ResumeInvalidationInfo(sus->InvalidationInfo);
 		if (xactHasCatcacheInvalidationMessages) 
 		{
diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
@@ -202,6 +202,7 @@
 #include "utils/rel.h"
 #include "utils/snapmgr.h"
 #include "utils/tqual.h"
+#include "utils/memutils.h"
 
 /* Uncomment the next line to test the graceful degradation code. */
 /* #define TEST_OLDSERXID */
@@ -4963,3 +4964,34 @@ predicatelock_twophase_recover(TransactionId xid, uint16 info,
 		CreatePredicateLock(&lockRecord->target, targettaghash, sxact);
 	}
 }
+
+typedef struct SuspendedPredicateState
+{
+	HTAB*             LocalPredicateLockHash;
+	SERIALIZABLEXACT* MySerializableXact;
+	bool              MyXactDidWrite;
+} SuspendedPredicateState;
+
+
+void* SuspendPredicate(void)
+{
+	SuspendedPredicateState *s = (SuspendedPredicateState*)MemoryContextAlloc(TopMemoryContext, sizeof(SuspendedPredicateState));
+	s->LocalPredicateLockHash = LocalPredicateLockHash;
+	s->MySerializableXact = MySerializableXact;
+	s->MyXactDidWrite = MyXactDidWrite;
+
+	LocalPredicateLockHash = NULL;
+	MySerializableXact = InvalidSerializableXact;
+	MyXactDidWrite = false;
+
+	return s;
+}
+
+void ResumePredicate(void *data)
+{
+	SuspendedPredicateState *s = (SuspendedPredicateState*)data;
+	LocalPredicateLockHash = s->LocalPredicateLockHash;
+	MySerializableXact = s->MySerializableXact;
+	MyXactDidWrite = s->MyXactDidWrite;
+	pfree(s);
+}
diff --git a/src/include/storage/predicate.h b/src/include/storage/predicate.h
@@ -70,4 +70,7 @@ extern void PredicateLockTwoPhaseFinish(TransactionId xid, bool isCommit);
 extern void predicatelock_twophase_recover(TransactionId xid, uint16 info,
 							   void *recdata, uint32 len);
 
+extern void* SuspendPredicate(void);
+extern void  ResumePredicate(void *data);
+
 #endif   /* PREDICATE_H */
