Reset relation and catalog cache in ATX only when needed

knizhnik · knizhnik · commit 21d2a8762caf · 2017-02-26T11:07:24.000+03:00
diff --git a/src/backend/access/transam/xact.c b/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;
@@ -3610,6 +3631,15 @@ bool ResumeTransaction(void)
 		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;
diff --git a/src/backend/utils/cache/inval.c b/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
diff --git a/src/backend/utils/time/snapmgr.c b/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;
 }
 
@@ -2207,8 +2204,5 @@ void ResumeSnapshot(void *data)
 	ActiveSnapshot = s->ActiveSnapshot;
 	OldestActiveSnapshot = s->OldestActiveSnapshot;
 
-	RelationCacheInvalidate();
-	ResetCatalogCaches();
-
 	free(s);
 }
diff --git a/src/include/utils/inval.h b/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 */
