Misc cleanup, mostly to reduce unnecessary differences with upstream.

Fix indentation, remove unused definitions, resolve some FIXMEs.

src/backend/access/spgist/spginsert.c

@@ -107,6 +107,7 @@ spgbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	SpGistInitBuffer(nullbuffer, SPGIST_LEAF | SPGIST_NULLS);
 	MarkBufferDirty(nullbuffer);
 
+
 	END_CRIT_SECTION();
 
 	UnlockReleaseBuffer(metabuffer);

src/backend/access/transam/xlog.c

@@ -4740,7 +4740,6 @@ BootStrapXLOG(void)
 	ReadControlFile();
 }
 
-
 static char *
 str_time(pg_time_t tnow)
 {
@@ -6486,7 +6485,7 @@ LogCheckpointEnd(bool restartpoint)
 	average_sync_time = 0;
 	if (CheckpointStats.ckpt_sync_rels > 0)
 		average_sync_time = CheckpointStats.ckpt_agg_sync_time /
-						CheckpointStats.ckpt_sync_rels;
+			CheckpointStats.ckpt_sync_rels;
 	average_msecs = (long) ((average_sync_time + 999) / 1000);
 
 	if (restartpoint)

src/backend/access/transam/xloginsert.c

@@ -149,9 +149,6 @@ static XLogRecData *XLogRecordAssemble(RmgrId rmid, uint8 info,
 static bool XLogCompressBackupBlock(char *page, uint16 hole_offset,
 									uint16 hole_length, char *dest, uint16 *dlen);
 
-/* Timeout in milliseconds for delaying WAL inserts to avoid WAL overflow */
-#define MB ((XLogRecPtr)1024*1024)
-
 /*
  * Begin constructing a WAL record. This must be called before the
  * XLogRegister* functions and XLogInsert().

src/backend/access/transam/xlogprefetcher.c

@@ -720,8 +720,9 @@ XLogPrefetcherNextBlock(uintptr_t pgsr_private, XLogRecPtr *lsn)
 			 * We could try to have a fast path for repeated references to the
 			 * same relation (with some scheme to handle invalidations
 			 * safely), but for now we'll call smgropen() every time.
+			 *
+			 * Only permanent relations are WAL-logged, so RELPERSISTENCE_PERMANENT.
 			 */
-			//FIXME what relpersistence should we use here?
 			reln = smgropen(block->rnode, InvalidBackendId, RELPERSISTENCE_PERMANENT);
 
 			/*

src/backend/access/transam/xlogreader.c

@@ -1846,7 +1846,6 @@ DecodeXLogRecord(XLogReaderState *state,
 				}
 				else
 					blk->hole_length = BLCKSZ - blk->bimg_len;
-
 				datatotal += blk->bimg_len;
 
 				/*
@@ -1992,7 +1991,6 @@ DecodeXLogRecord(XLogReaderState *state,
 
 	/* Report the actual size we used. */
 	decoded->size = MAXALIGN(out - (char *) decoded);
-
 	Assert(DecodeXLogRecordRequiredSpace(record->xl_tot_len) >=
 		   decoded->size);
 

src/backend/access/transam/xlogrecovery.c

@@ -1452,8 +1452,6 @@ FinishWalRecovery(void)
 	 * An important side-effect of this is to load the last page into
 	 * xlogreader. The caller uses it to initialize the WAL for writing.
 	 */
-
-
 	if (!InRecovery)
 	{
 		lastRec = CheckPointLoc;

src/backend/access/transam/xlogutils.c

@@ -378,7 +378,6 @@ XLogReadBufferForRedoExtended(XLogReaderState *record,
 	{
 		if (mode == RBM_ZERO_AND_LOCK || mode == RBM_ZERO_AND_CLEANUP_LOCK)
 		{
-			//FIXME assume relpersistence permanent. Is it always true?
 			*buf = ReadBufferWithoutRelcache(rnode, forknum,
 											 blkno, mode, NULL, true);
 			return BLK_DONE;

src/backend/replication/walsender.c

@@ -2879,7 +2879,7 @@ XLogSendPhysical(void)
 	 *
 	 * In theory we could make XLogFlush() record a time in shmem whenever WAL
 	 * is flushed and we could get that time as well as the LSN when we call
-	 * GetFlushRecPtr(NULL) above (and likewise for the cascading standby
+	 * GetFlushRecPtr() above (and likewise for the cascading standby
 	 * equivalent), but rather than putting any new code into the hot WAL path
 	 * it seems good enough to capture the time here.  We should reach this
 	 * after XLogFlush() runs WalSndWakeupProcessRequests(), and although that
@@ -2974,8 +2974,8 @@ XLogSendPhysical(void)
 	Assert(nbytes <= MAX_SEND_SIZE);
 
 	/*
-	* OK to read and send the slice.
-	*/
+	 * OK to read and send the slice.
+	 */
 	if (output_message.data)
 		resetStringInfo(&output_message);
 	else
@@ -2987,32 +2987,32 @@ XLogSendPhysical(void)
 	pq_sendint64(&output_message, 0);	/* sendtime, filled in last */
 
 	/*
-	* Read the log directly into the output buffer to avoid extra memcpy
-	* calls.
-	*/
+	 * Read the log directly into the output buffer to avoid extra memcpy
+	 * calls.
+	 */
 	enlargeStringInfo(&output_message, nbytes);
 
 retry:
 	if (!WALRead(xlogreader,
-				&output_message.data[output_message.len],
-				startptr,
-				nbytes,
-				xlogreader->seg.ws_tli,	/* Pass the current TLI because
-											* only WalSndSegmentOpen controls
-											* whether new TLI is needed. */
-				&errinfo))
+				 &output_message.data[output_message.len],
+				 startptr,
+				 nbytes,
+				 xlogreader->seg.ws_tli,	/* Pass the current TLI because
+											 * only WalSndSegmentOpen controls
+											 * whether new TLI is needed. */
+				 &errinfo))
 		WALReadRaiseError(&errinfo);
 
 	/* See logical_read_xlog_page(). */
 	XLByteToSeg(startptr, segno, xlogreader->segcxt.ws_segsize);
 	CheckXLogRemoved(segno, xlogreader->seg.ws_tli);
 
 	/*
-	* During recovery, the currently-open WAL file might be replaced with the
-	* file of the same name retrieved from archive. So we always need to
-	* check what we read was valid after reading into the buffer. If it's
-	* invalid, we try to open and read the file again.
-	*/
+	 * During recovery, the currently-open WAL file might be replaced with the
+	 * file of the same name retrieved from archive. So we always need to
+	 * check what we read was valid after reading into the buffer. If it's
+	 * invalid, we try to open and read the file again.
+	 */
 	if (am_cascading_walsender)
 	{
 		WalSnd	   *walsnd = MyWalSnd;
@@ -3035,12 +3035,12 @@ XLogSendPhysical(void)
 	output_message.data[output_message.len] = '\0';
 
 	/*
-		* Fill the send timestamp last, so that it is taken as late as possible.
-		*/
+	 * Fill the send timestamp last, so that it is taken as late as possible.
+	 */
 	resetStringInfo(&tmpbuf);
 	pq_sendint64(&tmpbuf, GetCurrentTimestamp());
 	memcpy(&output_message.data[1 + sizeof(int64) + sizeof(int64)],
-			tmpbuf.data, sizeof(int64));
+		   tmpbuf.data, sizeof(int64));
 
 	pq_putmessage_noblock('d', output_message.data, output_message.len);
 
@@ -3078,7 +3078,7 @@ XLogSendLogical(void)
 	/*
 	 * We'll use the current flush point to determine whether we've caught up.
 	 * This variable is static in order to cache it across calls.  Caching is
-	 * helpful because GetFlushRecPtr(NULL) needs to acquire a heavily-contended
+	 * helpful because GetFlushRecPtr() needs to acquire a heavily-contended
 	 * spinlock.
 	 */
 	static XLogRecPtr flushPtr = InvalidXLogRecPtr;

src/backend/storage/buffer/bufmgr.c

@@ -58,6 +58,7 @@
 #include "utils/timestamp.h"
 #include "replication/walsender.h"
 
+
 /* Note: these two macros only work on shared buffers, not local ones! */
 #define BufHdrGetBlock(bufHdr)	((Block) (BufferBlocks + ((Size) (bufHdr)->buf_id) * BLCKSZ))
 #define BufferGetLSN(bufHdr)	(PageGetLSN(BufHdrGetBlock(bufHdr)))
@@ -806,13 +807,14 @@ ReadBufferWithoutRelcache(RelFileNode rnode, ForkNumber forkNum,
 	bool		hit;
 
 	SMgrRelation smgr = smgropen(rnode, InvalidBackendId,
-							 	 RELPERSISTENCE_PERMANENT);
+								 RELPERSISTENCE_PERMANENT);
 
 	return ReadBuffer_common(smgr, permanent ? RELPERSISTENCE_PERMANENT :
 							 RELPERSISTENCE_UNLOGGED, forkNum, blockNum,
 							 mode, strategy, &hit);
 }
 
+
 /*
  * ReadBuffer_common -- common logic for all ReadBuffer variants
  *

src/backend/storage/page/bufpage.c

@@ -427,6 +427,7 @@ PageRestoreTempPage(Page tempPage, Page oldPage)
 
 	pageSize = PageGetPageSize(tempPage);
 	memcpy((char *) oldPage, (char *) tempPage, pageSize);
+
 	pfree(tempPage);
 }
 

src/backend/utils/misc/guc.c

@@ -193,7 +193,6 @@ static int	syslog_facility = 0;
 static void assign_syslog_facility(int newval, void *extra);
 static void assign_syslog_ident(const char *newval, void *extra);
 static void assign_session_replication_role(int newval, void *extra);
-
 static bool check_temp_buffers(int *newval, void **extra, GucSource source);
 static bool check_bonjour(bool *newval, void **extra, GucSource source);
 static bool check_ssl(bool *newval, void **extra, GucSource source);
@@ -12309,7 +12308,6 @@ assign_session_replication_role(int newval, void *extra)
 		ResetPlanCache();
 }
 
-
 static bool
 check_temp_buffers(int *newval, void **extra, GucSource source)
 {

src/include/access/xlog.h

@@ -26,10 +26,8 @@
 #define SYNC_METHOD_OPEN_DSYNC	4	/* for O_DSYNC */
 extern PGDLLIMPORT int sync_method;
 
-
 extern PGDLLIMPORT XLogRecPtr ProcLastRecPtr;
 extern PGDLLIMPORT XLogRecPtr XactLastRecEnd;
-
 extern PGDLLIMPORT XLogRecPtr XactLastCommitEnd;
 
 /*

src/include/access/xlogreader.h

@@ -216,7 +216,7 @@ struct XLogReaderState
 	/* Set when XLP_FIRST_IS_OVERWRITE_CONTRECORD is found */
 	XLogRecPtr	overwrittenRecPtr;
 
-	/* Disable validation to allow dumpng corrupt WAL */
+	/* Disable validation to allow dumping corrupt WAL */
 	bool skip_page_validation;
 	bool skip_invalid_records;
 	bool skip_lsn_checks;

src/include/replication/walsender.h

@@ -51,7 +51,8 @@ extern void WalSndRqstFileReload(void);
 
 /*
  * Hook to check for WAL receiving backpressure.
- * Return value in microseconds */
+ * Return value in microseconds
+ */
 extern uint64 (*delay_backend_us)(void);
 
 /* expose these so that they can be reused by the neon walproposer extension */
@@ -60,12 +61,12 @@ extern TimeOffset LagTrackerRead(int head, XLogRecPtr lsn, TimestampTz now);
 extern void ProcessStandbyReply(XLogRecPtr writePtr, XLogRecPtr flushPtr,
 								XLogRecPtr applyPtr, TimestampTz replyTime,
 								bool replyRequested);
-void       PhysicalConfirmReceivedLocation(XLogRecPtr lsn);
-void       ProcessStandbyHSFeedback(TimestampTz   replyTime,
-									TransactionId feedbackXmin,
-									uint32		feedbackEpoch,
-									TransactionId feedbackCatalogXmin,
-									uint32		feedbackCatalogEpoch);
+extern void PhysicalConfirmReceivedLocation(XLogRecPtr lsn);
+extern void ProcessStandbyHSFeedback(TimestampTz   replyTime,
+									 TransactionId feedbackXmin,
+									 uint32		feedbackEpoch,
+									 TransactionId feedbackCatalogXmin,
+									 uint32		feedbackCatalogEpoch);
 
 /*
  * Remember that we want to wakeup walsenders later

src/include/storage/bufmgr.h

@@ -230,8 +230,6 @@ extern void BufferGetTag(Buffer buffer, RelFileNode *rnode,
 
 extern void MarkBufferDirtyHint(Buffer buffer, bool buffer_std);
 
-extern void MarkBufferPermanent(Buffer buffer);
-
 extern void UnlockBuffers(void);
 extern void LockBuffer(Buffer buffer, int mode);
 extern bool ConditionalLockBuffer(Buffer buffer);