mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
Re-run pgindent, fixing a problem where comment lines after a blank
comment line where output as too long, and update typedefs for /lib directory. Also fix case where identifiers were used as variable names in the backend, but as typedefs in ecpg (favor the backend for indenting). Backpatch to 8.1.X.
This commit is contained in:
@ -10,7 +10,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.215 2005/10/15 02:49:09 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.216 2005/11/22 18:17:07 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -750,8 +750,8 @@ RecordTransactionCommit(void)
|
||||
* XLOG record generated by nextval will hit the disk before we report
|
||||
* the transaction committed.
|
||||
*
|
||||
* Note: if we generated a commit record above, MyXactMadeXLogEntry will
|
||||
* certainly be set now.
|
||||
* Note: if we generated a commit record above, MyXactMadeXLogEntry
|
||||
* will certainly be set now.
|
||||
*/
|
||||
if (MyXactMadeXLogEntry)
|
||||
{
|
||||
@ -762,8 +762,8 @@ RecordTransactionCommit(void)
|
||||
* because on most Unixen, the minimum select() delay is 10msec or
|
||||
* more, which is way too long.)
|
||||
*
|
||||
* We do not sleep if enableFsync is not turned on, nor if there are
|
||||
* fewer than CommitSiblings other backends with active
|
||||
* We do not sleep if enableFsync is not turned on, nor if there
|
||||
* are fewer than CommitSiblings other backends with active
|
||||
* transactions.
|
||||
*/
|
||||
if (CommitDelay > 0 && enableFsync &&
|
||||
@ -993,10 +993,10 @@ RecordTransactionAbort(void)
|
||||
* nowhere in permanent storage, so no one else will ever care if it
|
||||
* committed.)
|
||||
*
|
||||
* We do not flush XLOG to disk unless deleting files, since the default
|
||||
* assumption after a crash would be that we aborted, anyway. For the
|
||||
* same reason, we don't need to worry about interlocking against
|
||||
* checkpoint start.
|
||||
* We do not flush XLOG to disk unless deleting files, since the
|
||||
* default assumption after a crash would be that we aborted, anyway.
|
||||
* For the same reason, we don't need to worry about interlocking
|
||||
* against checkpoint start.
|
||||
*/
|
||||
if (MyLastRecPtr.xrecoff != 0 || nrels > 0)
|
||||
{
|
||||
@ -1042,8 +1042,8 @@ RecordTransactionAbort(void)
|
||||
* Mark the transaction aborted in clog. This is not absolutely
|
||||
* necessary but we may as well do it while we are here.
|
||||
*
|
||||
* The ordering here isn't critical but it seems best to mark the parent
|
||||
* first. This assures an atomic transition of all the
|
||||
* The ordering here isn't critical but it seems best to mark the
|
||||
* parent first. This assures an atomic transition of all the
|
||||
* subtransactions to aborted state from the point of view of
|
||||
* concurrent TransactionIdDidAbort calls.
|
||||
*/
|
||||
@ -1520,11 +1520,11 @@ CommitTransaction(void)
|
||||
* it's too late to abort the transaction. This should be just
|
||||
* noncritical resource releasing.
|
||||
*
|
||||
* The ordering of operations is not entirely random. The idea is: release
|
||||
* resources visible to other backends (eg, files, buffer pins); then
|
||||
* release locks; then release backend-local resources. We want to release
|
||||
* locks at the point where any backend waiting for us will see our
|
||||
* transaction as being fully cleaned up.
|
||||
* The ordering of operations is not entirely random. The idea is:
|
||||
* release resources visible to other backends (eg, files, buffer pins);
|
||||
* then release locks; then release backend-local resources. We want to
|
||||
* release locks at the point where any backend waiting for us will see
|
||||
* our transaction as being fully cleaned up.
|
||||
*
|
||||
* Resources that can be associated with individual queries are handled by
|
||||
* the ResourceOwner mechanism. The other calls here are for backend-wide
|
||||
@ -1630,9 +1630,9 @@ PrepareTransaction(void)
|
||||
* Do pre-commit processing (most of this stuff requires database access,
|
||||
* and in fact could still cause an error...)
|
||||
*
|
||||
* It is possible for PrepareHoldablePortals to invoke functions that queue
|
||||
* deferred triggers, and it's also possible that triggers create holdable
|
||||
* cursors. So we have to loop until there's nothing left to do.
|
||||
* It is possible for PrepareHoldablePortals to invoke functions that
|
||||
* queue deferred triggers, and it's also possible that triggers create
|
||||
* holdable cursors. So we have to loop until there's nothing left to do.
|
||||
*/
|
||||
for (;;)
|
||||
{
|
||||
@ -1715,9 +1715,9 @@ PrepareTransaction(void)
|
||||
/*
|
||||
* Here is where we really truly prepare.
|
||||
*
|
||||
* We have to record transaction prepares even if we didn't make any updates,
|
||||
* because the transaction manager might get confused if we lose a global
|
||||
* transaction.
|
||||
* We have to record transaction prepares even if we didn't make any
|
||||
* updates, because the transaction manager might get confused if we lose
|
||||
* a global transaction.
|
||||
*/
|
||||
EndPrepare(gxact);
|
||||
|
||||
@ -1868,10 +1868,11 @@ AbortTransaction(void)
|
||||
* s->currentUser, since it may not be set yet; instead rely on internal
|
||||
* state of miscinit.c.
|
||||
*
|
||||
* (Note: it is not necessary to restore session authorization here because
|
||||
* that can only be changed via GUC, and GUC will take care of rolling it
|
||||
* back if need be. However, an error within a SECURITY DEFINER function
|
||||
* could send control here with the wrong current userid.)
|
||||
* (Note: it is not necessary to restore session authorization here
|
||||
* because that can only be changed via GUC, and GUC will take care of
|
||||
* rolling it back if need be. However, an error within a SECURITY
|
||||
* DEFINER function could send control here with the wrong current
|
||||
* userid.)
|
||||
*/
|
||||
AtAbort_UserId();
|
||||
|
||||
@ -2353,8 +2354,8 @@ AbortCurrentTransaction(void)
|
||||
|
||||
/*
|
||||
* Here, we are already in an aborted transaction state and are
|
||||
* waiting for a ROLLBACK, but for some reason we failed again!
|
||||
* So we just remain in the abort state.
|
||||
* waiting for a ROLLBACK, but for some reason we failed again! So
|
||||
* we just remain in the abort state.
|
||||
*/
|
||||
case TBLOCK_ABORT:
|
||||
case TBLOCK_SUBABORT:
|
||||
|
Reference in New Issue
Block a user