From cb94db91b257c6375f597d9e9df2f48d5326a967 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Thu, 16 Jun 2011 16:16:34 +0300
Subject: [PATCH] pgindent run of recent SSI changes. Also, remove an
unnecessary #include.
Kevin Grittner
---
src/backend/access/nbtree/nbtree.c | 1 -
src/backend/access/nbtree/nbtsearch.c | 4 ++--
src/backend/access/transam/twophase_rmgr.c | 4 ++--
src/backend/storage/lmgr/predicate.c | 11 +++++------
src/include/storage/predicate.h | 2 +-
src/include/storage/predicate_internals.h | 10 +++++-----
6 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 6a7ddd7db4d..ac86eb494f6 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -29,7 +29,6 @@
#include "storage/indexfsm.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
-#include "storage/predicate.h"
#include "storage/smgr.h"
#include "tcop/tcopprot.h"
#include "utils/memutils.h"
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 0771d194636..5c00fac533b 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -849,8 +849,8 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
if (!BufferIsValid(buf))
{
/*
- * We only get here if the index is completely empty.
- * Lock relation because nothing finer to lock exists.
+ * We only get here if the index is completely empty. Lock relation
+ * because nothing finer to lock exists.
*/
PredicateLockRelation(rel, scan->xs_snapshot);
return false;
diff --git a/src/backend/access/transam/twophase_rmgr.c b/src/backend/access/transam/twophase_rmgr.c
index bbfec0da69e..eeb445da9d7 100644
--- a/src/backend/access/transam/twophase_rmgr.c
+++ b/src/backend/access/transam/twophase_rmgr.c
@@ -26,7 +26,7 @@ const TwoPhaseCallback twophase_recover_callbacks[TWOPHASE_RM_MAX_ID + 1] =
NULL, /* END ID */
lock_twophase_recover, /* Lock */
NULL, /* pgstat */
- multixact_twophase_recover, /* MultiXact */
+ multixact_twophase_recover, /* MultiXact */
predicatelock_twophase_recover /* PredicateLock */
};
@@ -44,7 +44,7 @@ const TwoPhaseCallback twophase_postabort_callbacks[TWOPHASE_RM_MAX_ID + 1] =
NULL, /* END ID */
lock_twophase_postabort, /* Lock */
pgstat_twophase_postabort, /* pgstat */
- multixact_twophase_postabort, /* MultiXact */
+ multixact_twophase_postabort, /* MultiXact */
NULL /* PredicateLock */
};
diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index a12f52ecc99..3678878f03e 100644
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -483,10 +483,9 @@ SerializationNeededForRead(Relation relation, Snapshot snapshot)
* MySerializableXact, so that subsequent calls to this function can exit
* quickly.
*
- * A transaction is flagged as RO_SAFE if all concurrent R/W
- * transactions commit without having conflicts out to an earlier
- * snapshot, thus ensuring that no conflicts are possible for this
- * transaction.
+ * A transaction is flagged as RO_SAFE if all concurrent R/W transactions
+ * commit without having conflicts out to an earlier snapshot, thus
+ * ensuring that no conflicts are possible for this transaction.
*/
if (SxactIsROSafe(MySerializableXact))
{
@@ -498,7 +497,7 @@ SerializationNeededForRead(Relation relation, Snapshot snapshot)
if (!PredicateLockingNeededForRelation(relation))
return false;
- return true; /* no excuse to skip predicate locking */
+ return true; /* no excuse to skip predicate locking */
}
/*
@@ -516,7 +515,7 @@ SerializationNeededForWrite(Relation relation)
if (!PredicateLockingNeededForRelation(relation))
return false;
- return true; /* no excuse to skip predicate locking */
+ return true; /* no excuse to skip predicate locking */
}
diff --git a/src/include/storage/predicate.h b/src/include/storage/predicate.h
index aae5326fd89..7b5846982e1 100644
--- a/src/include/storage/predicate.h
+++ b/src/include/storage/predicate.h
@@ -54,7 +54,7 @@ extern void ReleasePredicateLocks(const bool isCommit);
/* conflict detection (may also trigger rollback) */
extern void CheckForSerializableConflictOut(const bool valid, const Relation relation, const HeapTuple tuple,
- const Buffer buffer, const Snapshot snapshot);
+ const Buffer buffer, const Snapshot snapshot);
extern void CheckForSerializableConflictIn(const Relation relation, const HeapTuple tuple, const Buffer buffer);
extern void CheckTableForSerializableConflictIn(const Relation relation);
diff --git a/src/include/storage/predicate_internals.h b/src/include/storage/predicate_internals.h
index b305c6a4c79..495983f3458 100644
--- a/src/include/storage/predicate_internals.h
+++ b/src/include/storage/predicate_internals.h
@@ -90,9 +90,9 @@ typedef struct SERIALIZABLEXACT
int pid; /* pid of associated process */
} SERIALIZABLEXACT;
-#define SXACT_FLAG_COMMITTED 0x00000001 /* already committed */
-#define SXACT_FLAG_PREPARED 0x00000002 /* about to commit */
-#define SXACT_FLAG_DOOMED 0x00000004 /* will roll back */
+#define SXACT_FLAG_COMMITTED 0x00000001 /* already committed */
+#define SXACT_FLAG_PREPARED 0x00000002 /* about to commit */
+#define SXACT_FLAG_DOOMED 0x00000004 /* will roll back */
/*
* The following flag actually means that the flagged transaction has a
* conflict out *to a transaction which committed ahead of it*. It's hard
@@ -132,8 +132,8 @@ typedef struct PredXactListData
/*
* These global variables are maintained when registering and cleaning up
* serializable transactions. They must be global across all backends,
- * but are not needed outside the predicate.c source file. Protected
- * by SerializableXactHashLock.
+ * but are not needed outside the predicate.c source file. Protected by
+ * SerializableXactHashLock.
*/
TransactionId SxactGlobalXmin; /* global xmin for active serializable
* transactions */
--
GitLab