mirror of
https://github.com/postgres/postgres.git
synced 2025-11-15 03:41:20 +03:00
Post-pgindent cleanup
Make slightly better decisions about indentation than what pgindent is capable of. Mostly breaking out long function calls into one line per argument, with a few other minor adjustments. No functional changes- all whitespace. pgindent ran cleanly (didn't change anything) after. Passes all regressions.
This commit is contained in:
@@ -610,9 +610,14 @@ gistProcessItup(GISTBuildState *buildstate, IndexTuple itup,
|
||||
newtup = gistgetadjusted(indexrel, idxtuple, itup, giststate);
|
||||
if (newtup)
|
||||
{
|
||||
blkno = gistbufferinginserttuples(buildstate, buffer, level,
|
||||
&newtup, 1, childoffnum,
|
||||
InvalidBlockNumber, InvalidOffsetNumber);
|
||||
blkno = gistbufferinginserttuples(buildstate,
|
||||
buffer,
|
||||
level,
|
||||
&newtup,
|
||||
1,
|
||||
childoffnum,
|
||||
InvalidBlockNumber,
|
||||
InvalidOffsetNumber);
|
||||
/* gistbufferinginserttuples() released the buffer */
|
||||
}
|
||||
else
|
||||
|
||||
@@ -3182,8 +3182,9 @@ l2:
|
||||
* we weren't looking, start over.
|
||||
*/
|
||||
if ((oldtup.t_data->t_infomask & HEAP_XMAX_IS_MULTI) ||
|
||||
!TransactionIdEquals(HeapTupleHeaderGetRawXmax(oldtup.t_data),
|
||||
xwait))
|
||||
!TransactionIdEquals(
|
||||
HeapTupleHeaderGetRawXmax(oldtup.t_data),
|
||||
xwait))
|
||||
goto l2;
|
||||
|
||||
can_continue = true;
|
||||
@@ -3201,8 +3202,9 @@ l2:
|
||||
* this point. Check for xmax change, and start over if so.
|
||||
*/
|
||||
if ((oldtup.t_data->t_infomask & HEAP_XMAX_IS_MULTI) ||
|
||||
!TransactionIdEquals(HeapTupleHeaderGetRawXmax(oldtup.t_data),
|
||||
xwait))
|
||||
!TransactionIdEquals(
|
||||
HeapTupleHeaderGetRawXmax(oldtup.t_data),
|
||||
xwait))
|
||||
goto l2;
|
||||
|
||||
/* Otherwise check if it committed or aborted */
|
||||
@@ -4183,8 +4185,9 @@ l3:
|
||||
|
||||
/* if the xmax changed in the meantime, start over */
|
||||
if ((tuple->t_data->t_infomask & HEAP_XMAX_IS_MULTI) ||
|
||||
!TransactionIdEquals(HeapTupleHeaderGetRawXmax(tuple->t_data),
|
||||
xwait))
|
||||
!TransactionIdEquals(
|
||||
HeapTupleHeaderGetRawXmax(tuple->t_data),
|
||||
xwait))
|
||||
goto l3;
|
||||
/* otherwise, we're good */
|
||||
require_sleep = false;
|
||||
@@ -4246,8 +4249,9 @@ l3:
|
||||
* for xmax change, and start over if so.
|
||||
*/
|
||||
if (!(tuple->t_data->t_infomask & HEAP_XMAX_IS_MULTI) ||
|
||||
!TransactionIdEquals(HeapTupleHeaderGetRawXmax(tuple->t_data),
|
||||
xwait))
|
||||
!TransactionIdEquals(
|
||||
HeapTupleHeaderGetRawXmax(tuple->t_data),
|
||||
xwait))
|
||||
goto l3;
|
||||
|
||||
/*
|
||||
@@ -4300,8 +4304,9 @@ l3:
|
||||
* this point. Check for xmax change, and start over if so.
|
||||
*/
|
||||
if ((tuple->t_data->t_infomask & HEAP_XMAX_IS_MULTI) ||
|
||||
!TransactionIdEquals(HeapTupleHeaderGetRawXmax(tuple->t_data),
|
||||
xwait))
|
||||
!TransactionIdEquals(
|
||||
HeapTupleHeaderGetRawXmax(tuple->t_data),
|
||||
xwait))
|
||||
goto l3;
|
||||
|
||||
/*
|
||||
|
||||
@@ -432,8 +432,8 @@ MultiXactIdExpand(MultiXactId multi, TransactionId xid, MultiXactStatus status)
|
||||
/*
|
||||
* Determine which of the members of the MultiXactId are still of
|
||||
* interest. This is any running transaction, and also any transaction
|
||||
* that grabbed something stronger than just a lock and was committed.
|
||||
* (An update that aborted is of no interest here.)
|
||||
* that grabbed something stronger than just a lock and was committed. (An
|
||||
* update that aborted is of no interest here.)
|
||||
*
|
||||
* (Removing dead members is just an optimization, but a useful one. Note
|
||||
* we have the same race condition here as above: j could be 0 at the end
|
||||
@@ -1349,7 +1349,9 @@ mXactCacheGetById(MultiXactId multi, MultiXactMember **members)
|
||||
memcpy(ptr, entry->members, size);
|
||||
|
||||
debug_elog3(DEBUG2, "CacheGet: found %s",
|
||||
mxid_to_string(multi, entry->nmembers, entry->members));
|
||||
mxid_to_string(multi,
|
||||
entry->nmembers,
|
||||
entry->members));
|
||||
return entry->nmembers;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1546,7 +1546,8 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible, bool xlog_switch)
|
||||
*/
|
||||
if (LogwrtResult.Write >= XLogCtl->xlblocks[curridx])
|
||||
elog(PANIC, "xlog write request %X/%X is past end of log %X/%X",
|
||||
(uint32) (LogwrtResult.Write >> 32), (uint32) LogwrtResult.Write,
|
||||
(uint32) (LogwrtResult.Write >> 32),
|
||||
(uint32) LogwrtResult.Write,
|
||||
(uint32) (XLogCtl->xlblocks[curridx] >> 32),
|
||||
(uint32) XLogCtl->xlblocks[curridx]);
|
||||
|
||||
@@ -7381,7 +7382,8 @@ CreateRestartPoint(int flags)
|
||||
{
|
||||
ereport(DEBUG2,
|
||||
(errmsg("skipping restartpoint, already performed at %X/%X",
|
||||
(uint32) (lastCheckPoint.redo >> 32), (uint32) lastCheckPoint.redo)));
|
||||
(uint32) (lastCheckPoint.redo >> 32),
|
||||
(uint32) lastCheckPoint.redo)));
|
||||
|
||||
UpdateMinRecoveryPoint(InvalidXLogRecPtr, true);
|
||||
if (flags & CHECKPOINT_IS_SHUTDOWN)
|
||||
|
||||
Reference in New Issue
Block a user