typos and clenup

kelvich · kelvich · commit 79506f247a11 · 2017-01-10T14:19:09.000+03:00
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -192,9 +192,9 @@ static bool twophaseExitRegistered = false;
  *
  * Replay of twophase records happens by the following rules:
  *		* On PREPARE redo KnownPreparedAdd() is called to add that transaction to
- *		  KnownPreparedList and no more actions taken.
- *		* On checkpoint we iterate through KnownPreparedList, move all prepare
- *		  records that behind redo_horizon to file and deleting items from list.
+ *		  KnownPreparedList and no more actions are taken.
+ *		* On checkpoint redo we iterate through KnownPreparedList and move all prepare
+ *		  records that behind redo_horizon to files and deleting them from list.
  *		* On COMMIT/ABORT we delete file or entry in KnownPreparedList.
  *		* At the end of recovery we move all known prepared transactions to disk
  *		  to allow RecoverPreparedTransactions/StandbyRecoverPreparedTransactions
@@ -1270,9 +1270,9 @@ ReadTwoPhaseFile(TransactionId xid, bool give_warnings)
  * Reads 2PC data from xlog. During checkpoint this data will be moved to
  * twophase files and ReadTwoPhaseFile should be used instead.
  *
- * Note clearly that this function accesses WAL during normal operation, similarly
- * to the way WALSender or Logical Decoding would do. It does not run during
- * crash recovery or standby processing.
+ * Note clearly that this function can access WAL during normal operation, similarly
+ * to the way WALSender or Logical Decoding would do.
+ *
  */
 static void
 XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)
@@ -1281,8 +1281,6 @@ XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)
 	XLogReaderState *xlogreader;
 	char	   *errormsg;
 
-	// Assert(!RecoveryInProgress());
-
 	xlogreader = XLogReaderAllocate(&read_local_xlog_page, NULL);
 	if (!xlogreader)
 		ereport(ERROR,
@@ -1682,27 +1680,6 @@ CheckPointTwoPhase(XLogRecPtr redo_horizon)
 							   serialized_xacts)));
 }
 
-/*
- * KnownPreparedAdd.
- *
- * Store correspondence of start/end lsn and xid in KnownPreparedList.
- * This is called during redo of prepare record to have list of prepared
- * transactions that aren't yet moved to 2PC files by the end of recovery.
- */
-void
-KnownPreparedAdd(XLogReaderState *record)
-{
-	KnownPreparedXact *xact;
-	TwoPhaseFileHeader *hdr = (TwoPhaseFileHeader *) XLogRecGetData(record);
-
-	xact = (KnownPreparedXact *) palloc(sizeof(KnownPreparedXact));
-	xact->xid = hdr->xid;
-	xact->prepare_start_lsn = record->ReadRecPtr;
-	xact->prepare_end_lsn = record->EndRecPtr;
-
-	dlist_push_tail(&KnownPreparedList, &xact->list_node);
-}
-
 /*
  * PrescanPreparedTransactions
  *
@@ -1741,6 +1718,13 @@ PrescanPreparedTransactions(TransactionId **xids_p, int *nxids_p)
 	int			nxids = 0;
 	int			allocsize = 0;
 
+	/*
+	 * Move prepared transactions from KnownPreparedList to files, if any.
+	 * It is possible to skip that step and teach subsequent code about
+	 * KnownPreparedList, but whole PrescanPreparedTransactions() happens
+	 * once during end of recovery or promote, so probably it isn't worth
+	 * complications.
+	 */
 	KnownPreparedRecreateFiles(InvalidXLogRecPtr);
 
 	cldir = AllocateDir(TWOPHASE_DIR);
@@ -2215,10 +2199,33 @@ RecordTransactionAbortPrepared(TransactionId xid,
 	SyncRepWaitForLSN(recptr, false);
 }
 
+/*
+ * KnownPreparedAdd.
+ *
+ * Store correspondence of start/end lsn and xid in KnownPreparedList.
+ * This is called during redo of prepare record to have list of prepared
+ * transactions that aren't yet moved to 2PC files by the end of recovery.
+ */
+void
+KnownPreparedAdd(XLogReaderState *record)
+{
+	KnownPreparedXact *xact;
+	TwoPhaseFileHeader *hdr = (TwoPhaseFileHeader *) XLogRecGetData(record);
+
+	Assert(RecoveryInProgress());
+
+	xact = (KnownPreparedXact *) palloc(sizeof(KnownPreparedXact));
+	xact->xid = hdr->xid;
+	xact->prepare_start_lsn = record->ReadRecPtr;
+	xact->prepare_end_lsn = record->EndRecPtr;
+
+	dlist_push_tail(&KnownPreparedList, &xact->list_node);
+}
+
 /*
  * KnownPreparedRemoveByXid
  *
- * Forget about prepared transaction. Called durind commit/abort.
+ * Forget about prepared transaction. Called during commit/abort redo.
  */
 void
 KnownPreparedRemoveByXid(TransactionId xid)
@@ -2254,7 +2261,7 @@ KnownPreparedRemoveByXid(TransactionId xid)
 /*
  * KnownPreparedRecreateFiles
  *
- * Moves prepare records from WAL to files. Callend during checkpoint replay
+ * Moves prepare records from WAL to files. Called during checkpoint replay
  * or PrescanPreparedTransactions.
  *
  * redo_horizon = InvalidXLogRecPtr indicates that all transactions from
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -5634,7 +5634,7 @@ xact_redo(XLogReaderState *record)
 	else if (info == XLOG_XACT_PREPARE)
 	{
 		/*
-		 * If that transaction will not be commited by the end of recovery then we
+		 * If that transaction will not be committed by the end of recovery then we
 		 * will need 2PC file (the record contents is exactly the 2PC file) to be able
 		 * to commit that later.
 		 * For now store xid and pointers to that record in KnownPreparedList.
diff --git a/src/test/recovery/t/009_twophase.pl b/src/test/recovery/t/009_twophase.pl
@@ -258,7 +258,7 @@
 
 
 ###############################################################################
-# Check for a lock confcict between prepared tx with DDL inside and replay of
+# Check for a lock conflict between prepared tx with DDL inside and replay of
 # XLOG_STANDBY_LOCK wal record.
 ###############################################################################
 
@@ -279,7 +279,7 @@
 
 
 ###############################################################################
-# Check that replay will correctly set SUBTRANS and properly andvance nextXid
+# Check that replay will correctly set SUBTRANS and properly advance nextXid
 # so it won't conflict with savepoint xids.
 ###############################################################################
 

Original file line number	Diff line number	Diff line change
`@@ -5634,7 +5634,7 @@ xact_redo(XLogReaderState *record)`
`5634`	`5634`	`else if (info == XLOG_XACT_PREPARE)`
`5635`	`5635`	`{`
`5636`	`5636`	`/*`
`5637`		`- * If that transaction will not be commited by the end of recovery then we`
	`5637`	`+ * If that transaction will not be committed by the end of recovery then we`
`5638`	`5638`	`* will need 2PC file (the record contents is exactly the 2PC file) to be able`
`5639`	`5639`	`* to commit that later.`
`5640`	`5640`	`* For now store xid and pointers to that record in KnownPreparedList.`