mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-21 08:29:39 +08:00
pgindent run of recent SSI changes. Also, remove an unnecessary #include.
Kevin Grittner
This commit is contained in:
parent
758bd2a433
commit
cb94db91b2
@ -29,7 +29,6 @@
|
|||||||
#include "storage/indexfsm.h"
|
#include "storage/indexfsm.h"
|
||||||
#include "storage/ipc.h"
|
#include "storage/ipc.h"
|
||||||
#include "storage/lmgr.h"
|
#include "storage/lmgr.h"
|
||||||
#include "storage/predicate.h"
|
|
||||||
#include "storage/smgr.h"
|
#include "storage/smgr.h"
|
||||||
#include "tcop/tcopprot.h"
|
#include "tcop/tcopprot.h"
|
||||||
#include "utils/memutils.h"
|
#include "utils/memutils.h"
|
||||||
|
@ -849,8 +849,8 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
|
|||||||
if (!BufferIsValid(buf))
|
if (!BufferIsValid(buf))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* We only get here if the index is completely empty.
|
* We only get here if the index is completely empty. Lock relation
|
||||||
* Lock relation because nothing finer to lock exists.
|
* because nothing finer to lock exists.
|
||||||
*/
|
*/
|
||||||
PredicateLockRelation(rel, scan->xs_snapshot);
|
PredicateLockRelation(rel, scan->xs_snapshot);
|
||||||
return false;
|
return false;
|
||||||
|
@ -26,7 +26,7 @@ const TwoPhaseCallback twophase_recover_callbacks[TWOPHASE_RM_MAX_ID + 1] =
|
|||||||
NULL, /* END ID */
|
NULL, /* END ID */
|
||||||
lock_twophase_recover, /* Lock */
|
lock_twophase_recover, /* Lock */
|
||||||
NULL, /* pgstat */
|
NULL, /* pgstat */
|
||||||
multixact_twophase_recover, /* MultiXact */
|
multixact_twophase_recover, /* MultiXact */
|
||||||
predicatelock_twophase_recover /* PredicateLock */
|
predicatelock_twophase_recover /* PredicateLock */
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -44,7 +44,7 @@ const TwoPhaseCallback twophase_postabort_callbacks[TWOPHASE_RM_MAX_ID + 1] =
|
|||||||
NULL, /* END ID */
|
NULL, /* END ID */
|
||||||
lock_twophase_postabort, /* Lock */
|
lock_twophase_postabort, /* Lock */
|
||||||
pgstat_twophase_postabort, /* pgstat */
|
pgstat_twophase_postabort, /* pgstat */
|
||||||
multixact_twophase_postabort, /* MultiXact */
|
multixact_twophase_postabort, /* MultiXact */
|
||||||
NULL /* PredicateLock */
|
NULL /* PredicateLock */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -483,10 +483,9 @@ SerializationNeededForRead(Relation relation, Snapshot snapshot)
|
|||||||
* MySerializableXact, so that subsequent calls to this function can exit
|
* MySerializableXact, so that subsequent calls to this function can exit
|
||||||
* quickly.
|
* quickly.
|
||||||
*
|
*
|
||||||
* A transaction is flagged as RO_SAFE if all concurrent R/W
|
* A transaction is flagged as RO_SAFE if all concurrent R/W transactions
|
||||||
* transactions commit without having conflicts out to an earlier
|
* commit without having conflicts out to an earlier snapshot, thus
|
||||||
* snapshot, thus ensuring that no conflicts are possible for this
|
* ensuring that no conflicts are possible for this transaction.
|
||||||
* transaction.
|
|
||||||
*/
|
*/
|
||||||
if (SxactIsROSafe(MySerializableXact))
|
if (SxactIsROSafe(MySerializableXact))
|
||||||
{
|
{
|
||||||
@ -498,7 +497,7 @@ SerializationNeededForRead(Relation relation, Snapshot snapshot)
|
|||||||
if (!PredicateLockingNeededForRelation(relation))
|
if (!PredicateLockingNeededForRelation(relation))
|
||||||
return false;
|
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))
|
if (!PredicateLockingNeededForRelation(relation))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return true; /* no excuse to skip predicate locking */
|
return true; /* no excuse to skip predicate locking */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -54,7 +54,7 @@ extern void ReleasePredicateLocks(const bool isCommit);
|
|||||||
|
|
||||||
/* conflict detection (may also trigger rollback) */
|
/* conflict detection (may also trigger rollback) */
|
||||||
extern void CheckForSerializableConflictOut(const bool valid, const Relation relation, const HeapTuple tuple,
|
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 CheckForSerializableConflictIn(const Relation relation, const HeapTuple tuple, const Buffer buffer);
|
||||||
extern void CheckTableForSerializableConflictIn(const Relation relation);
|
extern void CheckTableForSerializableConflictIn(const Relation relation);
|
||||||
|
|
||||||
|
@ -90,9 +90,9 @@ typedef struct SERIALIZABLEXACT
|
|||||||
int pid; /* pid of associated process */
|
int pid; /* pid of associated process */
|
||||||
} SERIALIZABLEXACT;
|
} SERIALIZABLEXACT;
|
||||||
|
|
||||||
#define SXACT_FLAG_COMMITTED 0x00000001 /* already committed */
|
#define SXACT_FLAG_COMMITTED 0x00000001 /* already committed */
|
||||||
#define SXACT_FLAG_PREPARED 0x00000002 /* about to commit */
|
#define SXACT_FLAG_PREPARED 0x00000002 /* about to commit */
|
||||||
#define SXACT_FLAG_DOOMED 0x00000004 /* will roll back */
|
#define SXACT_FLAG_DOOMED 0x00000004 /* will roll back */
|
||||||
/*
|
/*
|
||||||
* The following flag actually means that the flagged transaction has a
|
* The following flag actually means that the flagged transaction has a
|
||||||
* conflict out *to a transaction which committed ahead of it*. It's hard
|
* 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
|
* These global variables are maintained when registering and cleaning up
|
||||||
* serializable transactions. They must be global across all backends,
|
* serializable transactions. They must be global across all backends,
|
||||||
* but are not needed outside the predicate.c source file. Protected
|
* but are not needed outside the predicate.c source file. Protected by
|
||||||
* by SerializableXactHashLock.
|
* SerializableXactHashLock.
|
||||||
*/
|
*/
|
||||||
TransactionId SxactGlobalXmin; /* global xmin for active serializable
|
TransactionId SxactGlobalXmin; /* global xmin for active serializable
|
||||||
* transactions */
|
* transactions */
|
||||||
|
Loading…
Reference in New Issue
Block a user