bring xact events back

kelvich · kelvich · commit d83d92225abc · 2018-02-02T01:49:08.000+03:00
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -1510,6 +1510,12 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
 	LWLockAcquire(TwoPhaseStateLock, LW_EXCLUSIVE);
 	RemoveGXact(gxact);
 	LWLockRelease(TwoPhaseStateLock);
+
+	if (isCommit)
+		CallXactCallbacks(XACT_EVENT_COMMIT_PREPARED);
+	else
+		CallXactCallbacks(XACT_EVENT_ABORT_PREPARED);
+
 	MyLockedGxact = NULL;
 
 	pfree(buf);
@@ -2408,3 +2414,13 @@ PrepareRedoRemove(TransactionId xid, bool giveWarning)
 
 	return;
 }
+
+
+/*
+ * Return identified of current global transaction
+ */
+const char*
+GetLockedGlobalTransactionId(void)
+{
+	return MyLockedGxact ? MyLockedGxact->gid : NULL;
+}
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -306,7 +306,6 @@ static void AtCommit_Memory(void);
 static void AtStart_Cache(void);
 static void AtStart_Memory(void);
 static void AtStart_ResourceOwner(void);
-static void CallXactCallbacks(XactEvent event);
 static void CallSubXactCallbacks(SubXactEvent event,
 					 SubTransactionId mySubid,
 					 SubTransactionId parentSubid);
@@ -1922,6 +1921,7 @@ StartTransaction(void)
 	 */
 	s->state = TRANS_INPROGRESS;
 
+	CallXactCallbacks(XACT_EVENT_START);
 	ShowTransactionState("StartTransaction");
 }
 
@@ -3335,7 +3335,7 @@ UnregisterXactCallback(XactCallback callback, void *arg)
 	}
 }
 
-static void
+void
 CallXactCallbacks(XactEvent event)
 {
 	XactCallbackItem *item;
diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h
@@ -57,4 +57,7 @@ extern void PrepareRedoAdd(char *buf, XLogRecPtr start_lsn,
 			   XLogRecPtr end_lsn);
 extern void PrepareRedoRemove(TransactionId xid, bool giveWarning);
 extern void restoreTwoPhaseData(void);
+
+extern const char *GetLockedGlobalTransactionId(void);
+
 #endif							/* TWOPHASE_H */
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
@@ -97,14 +97,17 @@ extern int	MyXactFlags;
  */
 typedef enum
 {
+	XACT_EVENT_START,
 	XACT_EVENT_COMMIT,
 	XACT_EVENT_PARALLEL_COMMIT,
 	XACT_EVENT_ABORT,
 	XACT_EVENT_PARALLEL_ABORT,
 	XACT_EVENT_PREPARE,
 	XACT_EVENT_PRE_COMMIT,
 	XACT_EVENT_PARALLEL_PRE_COMMIT,
-	XACT_EVENT_PRE_PREPARE
+	XACT_EVENT_PRE_PREPARE,
+	XACT_EVENT_COMMIT_PREPARED,
+	XACT_EVENT_ABORT_PREPARED
 } XactEvent;
 
 typedef void (*XactCallback) (XactEvent event, void *arg);
@@ -405,5 +408,6 @@ extern void ParseAbortRecord(uint8 info, xl_xact_abort *xlrec, xl_xact_parsed_ab
 extern void EnterParallelMode(void);
 extern void ExitParallelMode(void);
 extern bool IsInParallelMode(void);
+extern void CallXactCallbacks(XactEvent event);
 
 #endif							/* XACT_H */

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,6 @@ static void AtCommit_Memory(void);`
`306`	`306`	`static void AtStart_Cache(void);`
`307`	`307`	`static void AtStart_Memory(void);`
`308`	`308`	`static void AtStart_ResourceOwner(void);`
`309`		`-static void CallXactCallbacks(XactEvent event);`
`310`	`309`	`static void CallSubXactCallbacks(SubXactEvent event,`
`311`	`310`	`SubTransactionId mySubid,`
`312`	`311`	`SubTransactionId parentSubid);`
`@@ -1922,6 +1921,7 @@ StartTransaction(void)`
`1922`	`1921`	`*/`
`1923`	`1922`	`s->state = TRANS_INPROGRESS;`
`1924`	`1923`
	`1924`	`+ CallXactCallbacks(XACT_EVENT_START);`
`1925`	`1925`	`ShowTransactionState("StartTransaction");`
`1926`	`1926`	`}`
`1927`	`1927`
`@@ -3335,7 +3335,7 @@ UnregisterXactCallback(XactCallback callback, void *arg)`
`3335`	`3335`	`}`
`3336`	`3336`	`}`
`3337`	`3337`
`3338`		`-static void`
	`3338`	`+void`
`3339`	`3339`	`CallXactCallbacks(XactEvent event)`
`3340`	`3340`	`{`
`3341`	`3341`	`XactCallbackItem *item;`