style fix for xtm patch

Author: kelvich

contrib/pg_tsdtm/tests/deploy/roles/postgres/tasks/main.yml

@@ -83,18 +83,6 @@
 - stat: path={{pg_datadir}}/postmaster.pid
   register: pg_pidfile
 
-# - name: stop postgres if it was running
-#   command: "{{pg_dst}}/bin/pg_ctl stop -w -D {{pg_datadir}}"
-#   environment:
-#     LD_LIBRARY_PATH: "{{pg_dst}}/lib"
-#   when: pg_pidfile.stat.exists
-
-- name: stop postgres if it was running
-  shell: "kill -9 `head -n 1 {{pg_datadir}}/postmaster.pid`"
-  environment:
-    LD_LIBRARY_PATH: "{{pg_dst}}/lib"
-  when: pg_pidfile.stat.exists
-
 - name: remove datadirs on datanodes
   command: "rm -rf {{pg_datadir}}"
   when: pg_destroy_and_init

src/backend/access/transam/clog.c

@@ -93,9 +93,9 @@ static void TransactionIdSetStatusBit(TransactionId xid, XidStatus status,
 static void set_status_by_pages(int nsubxids, TransactionId *subxids,
 					XidStatus status, XLogRecPtr lsn);
 
-void 
+void
 TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
-                           TransactionId *subxids, XidStatus status, XLogRecPtr lsn)
+							TransactionId *subxids, XidStatus status, XLogRecPtr lsn)
 {
 	return TM->SetTransactionStatus(xid, nsubxids, subxids, status, lsn);
 }
@@ -151,7 +151,7 @@ TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
  * but aren't yet in cache, as well as hinting pages not to fall out of
  * cache yet.
  */
-void 
+void
 PgTransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
 					TransactionId *subxids, XidStatus status, XLogRecPtr lsn)
 {

src/backend/access/transam/transam.c

@@ -256,12 +256,12 @@ TransactionIdIsKnownCompleted(TransactionId transactionId)
  * This commit operation is not guaranteed to be atomic, but if not, subxids
  * are correctly marked subcommit first.
  */
-void 
+void
 TransactionIdCommitTree(TransactionId xid, int nxids, TransactionId *xids)
 {
 	TransactionIdSetTreeStatus(xid, nxids, xids,
-                               TRANSACTION_STATUS_COMMITTED,
-                               InvalidXLogRecPtr);
+							   TRANSACTION_STATUS_COMMITTED,
+							   InvalidXLogRecPtr);
 }
 
 /*
@@ -273,7 +273,7 @@ TransactionIdAsyncCommitTree(TransactionId xid, int nxids, TransactionId *xids,
 							 XLogRecPtr lsn)
 {
 	TransactionIdSetTreeStatus(xid, nxids, xids,
-                               TRANSACTION_STATUS_COMMITTED, lsn);
+							   TRANSACTION_STATUS_COMMITTED, lsn);
 }
 
 /*

src/backend/access/transam/xact.c

@@ -1273,9 +1273,8 @@ RecordTransactionCommit(void)
 		/*
 		 * Now we may update the CLOG, if we wrote a COMMIT record above
 		 */
-		if (markXidCommitted) {
+		if (markXidCommitted)
 			TransactionIdCommitTree(xid, nchildren, children);
-		}
 	}
 	else
 	{
@@ -1297,9 +1296,8 @@ RecordTransactionCommit(void)
 		 * XLOG. Instead, we store the LSN up to which the XLOG must be
 		 * flushed before the CLOG may be updated.
 		 */
-		if (markXidCommitted) {
+		if (markXidCommitted)
 			TransactionIdAsyncCommitTree(xid, nchildren, children, XactLastRecEnd);
-		}
 	}
 
 	/*
@@ -5372,7 +5370,7 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 		 * recovered. It's unlikely but it's good to be safe.
 		 */
 		TransactionIdAsyncCommitTree(
-				xid, parsed->nsubxacts, parsed->subxacts, lsn);
+							  xid, parsed->nsubxacts, parsed->subxacts, lsn);
 
 		/*
 		 * We must mark clog before we update the ProcArray.
@@ -5399,6 +5397,7 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 		 */
 		StandbyReleaseLockTree(xid, 0, NULL);
 	}
+
 	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
 	{
 		/* recover apply progress */
@@ -5609,8 +5608,9 @@ xact_redo(XLogReaderState *record)
 		elog(PANIC, "xact_redo: unknown op code %u", info);
 }
 
-void MarkAsAborted()
+void
+MarkAsAborted()
 {
-    CurrentTransactionState->state = TRANS_INPROGRESS;
-    CurrentTransactionState->blockState = TBLOCK_STARTED;
+	CurrentTransactionState->state = TRANS_INPROGRESS;
+	CurrentTransactionState->blockState = TBLOCK_STARTED;
 }

src/backend/access/transam/xtm.c

@@ -25,7 +25,7 @@ TransactionId PgGetGlobalTransactionId(void)
 
 bool PgDetectGlobalDeadLock(PGPROC* proc)
 {
-    return false;
+	return false;
 }
 
 char const* PgGetTransactionManagerName(void)
@@ -42,7 +42,7 @@ TransactionManager PgTM = {
 	PgTransactionIdIsInProgress,
 	PgGetGlobalTransactionId,
 	PgXidInMVCCSnapshot,
-    PgDetectGlobalDeadLock,
+	PgDetectGlobalDeadLock,
 	PgGetTransactionManagerName
 };
 

src/backend/storage/lmgr/lock.c

@@ -3639,7 +3639,7 @@ GetLockmodeName(LOCKMETHODID lockmethodid, LOCKMODE mode)
 	return LockMethods[lockmethodid]->lockModeNames[mode];
 }
 
-void 
+void
 EnumerateLocks(LockIterator iterator, void* arg)
 {
 	PROCLOCK   *proclock;
@@ -3649,8 +3649,8 @@ EnumerateLocks(LockIterator iterator, void* arg)
 
 	while ((proclock = (PROCLOCK *) hash_seq_search(&status)) != NULL)
 	{
-        iterator(proclock, arg);
-    }
+		iterator(proclock, arg);
+	}
 }
 
 #ifdef LOCK_DEBUG

src/include/access/clog.h

@@ -31,7 +31,7 @@ typedef int XidStatus;
 
 
 extern void TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
-                                       TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
+				   TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
 extern XidStatus TransactionIdGetStatus(TransactionId xid, XLogRecPtr *lsn);
 
 extern Size CLOGShmemBuffers(void);

src/include/access/xtm.h

@@ -42,8 +42,8 @@ typedef struct
 	/* Is the given XID still-in-progress according to the snapshot (encapsulation of XidInMVCCSnapshot in tqual.c) */
 	bool (*IsInSnapshot)(TransactionId xid, Snapshot snapshot);
 
-    /* Detect distributed deadlock */
-    bool (*DetectGlobalDeadLock)(PGPROC* proc);
+	/* Detect distributed deadlock */
+	bool (*DetectGlobalDeadLock)(PGPROC* proc);
 
 	char const* (*GetName)(void);
 } TransactionManager;
@@ -58,7 +58,7 @@ extern TransactionManager PgTM; /* Standard PostgreSQL transaction manager */
 extern bool PgXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot);
 
 extern void PgTransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
-                                         TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
+					TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
 extern XidStatus PgTransactionIdGetStatus(TransactionId xid, XLogRecPtr *lsn);
 
 extern Snapshot PgGetSnapshotData(Snapshot snapshot);

src/include/storage/lock.h

@@ -456,7 +456,7 @@ typedef enum
 	DS_HARD_DEADLOCK,			/* deadlock, no way out but ERROR */
 	DS_BLOCKED_BY_AUTOVACUUM,	/* no deadlock; queue blocked by autovacuum
 								 * worker */
-    DS_DISTRIBUTED_DEADLOCK     /* distributed deadlock detected by DTM */
+	DS_DISTRIBUTED_DEADLOCK		/* distributed deadlock detected by DTM */
 } DeadLockState;
 
 /*