cleanup 2

Author: kelvich

src/backend/access/transam/twophase.c

@@ -219,22 +219,18 @@ StandbyCheckPointTwoPhase(XLogRecPtr redo_horizon)
 
 	// Assert(RecoveryInProgress());
 
-	elog(WARNING, "StandbyCheckPointTwoPhase");
-
 	TRACE_POSTGRESQL_TWOPHASE_CHECKPOINT_START();
 
 	dlist_foreach_modify(miter, &StandbyTwoPhaseStateData)
 	{
 		StandbyPreparedTransaction   *xact = dlist_container(StandbyPreparedTransaction,
 															list_node, miter.cur);
 
-		if (redo_horizon == 0 || xact->prepare_end_lsn <= redo_horizon)
-		// if (true)
+		if (redo_horizon == InvalidXLogRecPtr || xact->prepare_end_lsn <= redo_horizon)
 		{
 			char	   *buf;
 			int			len;
 
-			fprintf(stderr, "2PC: checkpoint: %x --> %d (horizon: %x)\n", xact->prepare_start_lsn, xact->xid, redo_horizon);
 			XlogReadTwoPhaseData(xact->prepare_start_lsn, &buf, &len);
 			RecreateTwoPhaseFile(xact->xid, buf, len);
 			pfree(buf);
@@ -270,8 +266,6 @@ StandbyAtCommit(TransactionId xid)
 
 		if (xact->xid == xid)
 		{
-			// pfree(xact);
-			fprintf(stderr, "2PC: commit: %x/%d\n", xact->prepare_start_lsn, xact->xid);
 			dlist_delete(miter.cur);
 			return;
 		}
@@ -1746,8 +1740,6 @@ StandbyAtPrepare(XLogReaderState *record)
 	xact->prepare_start_lsn = record->ReadRecPtr;
 	xact->prepare_end_lsn = record->EndRecPtr;
 
-	fprintf(stderr, "2PC: at_prepare: %x/%d\n", xact->prepare_start_lsn, xact->xid);
-
 	dlist_push_tail(&StandbyTwoPhaseStateData, &xact->list_node);
 }
 
@@ -1789,7 +1781,6 @@ PrescanPreparedTransactions(TransactionId **xids_p, int *nxids_p)
 	int			nxids = 0;
 	int			allocsize = 0;
 
-	fprintf(stderr, "--- PrescanPreparedTransactions\n");
 	StandbyCheckPointTwoPhase(0);
 
 	cldir = AllocateDir(TWOPHASE_DIR);
@@ -1928,8 +1919,6 @@ StandbyRecoverPreparedTransactions(bool overwriteOK)
 	DIR		   *cldir;
 	struct dirent *clde;
 
-	fprintf(stderr, "--- StandbyRecoverPreparedTransactions\n");
-
 	cldir = AllocateDir(TWOPHASE_DIR);
 	while ((clde = ReadDir(cldir, TWOPHASE_DIR)) != NULL)
 	{
@@ -2013,8 +2002,6 @@ RecoverPreparedTransactions(void)
 	struct dirent *clde;
 	bool		overwriteOK = false;
 
-	fprintf(stderr, "--- RecoverPreparedTransactions\n");
-
 	snprintf(dir, MAXPGPATH, "%s", TWOPHASE_DIR);
 
 	cldir = AllocateDir(dir);

src/backend/access/transam/xact.c

@@ -5604,7 +5604,6 @@ xact_redo(XLogReaderState *record)
 			Assert(TransactionIdIsValid(parsed.twophase_xid));
 			xact_redo_commit(&parsed, parsed.twophase_xid,
 							 record->EndRecPtr, XLogRecGetOrigin(record));
-			// RemoveTwoPhaseFile(parsed.twophase_xid, false);
 			StandbyAtCommit(parsed.twophase_xid);
 		}
 	}
@@ -5625,17 +5624,12 @@ xact_redo(XLogReaderState *record)
 		{
 			Assert(TransactionIdIsValid(parsed.twophase_xid));
 			xact_redo_abort(&parsed, parsed.twophase_xid);
-			// RemoveTwoPhaseFile(parsed.twophase_xid, false);
 			StandbyAtCommit(parsed.twophase_xid);
 		}
 	}
 	else if (info == XLOG_XACT_PREPARE)
 	{
 		/* the record contents are exactly the 2PC file */
-		// elog(WARNING, "2PC: RecreateTwoPhaseFile");
-		// RecreateTwoPhaseFile(XLogRecGetXid(record),
-		// 				  XLogRecGetData(record), XLogRecGetDataLen(record));
-		elog(WARNING, "reading prepared tx");
 		StandbyAtPrepare(record);
 	}
 	else if (info == XLOG_XACT_ASSIGNMENT)

src/backend/access/transam/xlog.c

@@ -6709,7 +6709,6 @@ StartupXLOG(void)
 
 				ProcArrayApplyRecoveryInfo(&running);
 
-				StandbyCheckPointTwoPhase(0);
 				StandbyRecoverPreparedTransactions(false);
 			}
 		}
@@ -8718,7 +8717,6 @@ CreateEndOfRecoveryRecord(void)
 	END_CRIT_SECTION();
 
 	LocalXLogInsertAllowed = -1;	/* return to "check" state */
-	// StandbyCheckPointTwoPhase(0);
 }
 
 /*
@@ -8742,7 +8740,6 @@ CheckPointGuts(XLogRecPtr checkPointRedo, int flags)
 	CheckPointBuffers(flags);	/* performs all required fsyncs */
 	CheckPointReplicationOrigin();
 	/* We deliberately delay 2PC checkpointing as long as possible */
-	StandbyCheckPointTwoPhase(checkPointRedo);
 	CheckPointTwoPhase(checkPointRedo);
 }
 
@@ -9339,7 +9336,6 @@ xlog_redo(XLogReaderState *record)
 	Assert(info == XLOG_FPI || info == XLOG_FPI_FOR_HINT ||
 		   !XLogRecHasAnyBlockRefs(record));
 
-	elog(WARNING, "2PC: xlog_redo, info=%x", info);
 	if (info == XLOG_NEXTOID)
 	{
 		Oid			nextOid;
@@ -9423,8 +9419,6 @@ xlog_redo(XLogReaderState *record)
 
 			ProcArrayApplyRecoveryInfo(&running);
 
-			fprintf(stderr, "--- aaa\n");
-			StandbyCheckPointTwoPhase(0);
 			StandbyRecoverPreparedTransactions(true);
 		}
 
@@ -9517,7 +9511,6 @@ xlog_redo(XLogReaderState *record)
 			ereport(PANIC,
 					(errmsg("unexpected timeline ID %u (should be %u) in checkpoint record",
 							xlrec.ThisTimeLineID, ThisTimeLineID)));
-		// StandbyCheckPointTwoPhase(0);
 	}
 	else if (info == XLOG_NOOP)
 	{