mirror of
https://github.com/postgres/postgres.git
synced 2025-09-02 04:21:28 +03:00
pgindent run for 9.5
This commit is contained in:
@@ -153,9 +153,8 @@ struct SnapBuild
|
||||
TransactionId xmax;
|
||||
|
||||
/*
|
||||
* Don't replay commits from an LSN < this LSN. This can be set
|
||||
* externally but it will also be advanced (never retreat) from within
|
||||
* snapbuild.c.
|
||||
* Don't replay commits from an LSN < this LSN. This can be set externally
|
||||
* but it will also be advanced (never retreat) from within snapbuild.c.
|
||||
*/
|
||||
XLogRecPtr start_decoding_at;
|
||||
|
||||
@@ -244,7 +243,7 @@ struct SnapBuild
|
||||
* removes knowledge about the previously used resowner, so we save it here.
|
||||
*/
|
||||
static ResourceOwner SavedResourceOwnerDuringExport = NULL;
|
||||
static bool ExportInProgress = false;
|
||||
static bool ExportInProgress = false;
|
||||
|
||||
/* transaction state manipulation functions */
|
||||
static void SnapBuildEndTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid);
|
||||
@@ -599,7 +598,7 @@ SnapBuildExportSnapshot(SnapBuild *builder)
|
||||
|
||||
ereport(LOG,
|
||||
(errmsg_plural("exported logical decoding snapshot: \"%s\" with %u transaction ID",
|
||||
"exported logical decoding snapshot: \"%s\" with %u transaction IDs",
|
||||
"exported logical decoding snapshot: \"%s\" with %u transaction IDs",
|
||||
snap->xcnt,
|
||||
snapname, snap->xcnt)));
|
||||
return snapname;
|
||||
@@ -904,8 +903,8 @@ SnapBuildEndTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid)
|
||||
ereport(LOG,
|
||||
(errmsg("logical decoding found consistent point at %X/%X",
|
||||
(uint32) (lsn >> 32), (uint32) lsn),
|
||||
errdetail("Transaction ID %u finished; no more running transactions.",
|
||||
xid)));
|
||||
errdetail("Transaction ID %u finished; no more running transactions.",
|
||||
xid)));
|
||||
builder->state = SNAPBUILD_CONSISTENT;
|
||||
}
|
||||
}
|
||||
@@ -1232,8 +1231,8 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
|
||||
{
|
||||
ereport(DEBUG1,
|
||||
(errmsg_internal("skipping snapshot at %X/%X while building logical decoding snapshot, xmin horizon too low",
|
||||
(uint32) (lsn >> 32), (uint32) lsn),
|
||||
errdetail_internal("initial xmin horizon of %u vs the snapshot's %u",
|
||||
(uint32) (lsn >> 32), (uint32) lsn),
|
||||
errdetail_internal("initial xmin horizon of %u vs the snapshot's %u",
|
||||
builder->initial_xmin_horizon, running->oldestRunningXid)));
|
||||
return true;
|
||||
}
|
||||
@@ -1252,8 +1251,8 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
|
||||
builder->start_decoding_at = lsn + 1;
|
||||
|
||||
/* As no transactions were running xmin/xmax can be trivially set. */
|
||||
builder->xmin = running->nextXid; /* < are finished */
|
||||
builder->xmax = running->nextXid; /* >= are running */
|
||||
builder->xmin = running->nextXid; /* < are finished */
|
||||
builder->xmax = running->nextXid; /* >= are running */
|
||||
|
||||
/* so we can safely use the faster comparisons */
|
||||
Assert(TransactionIdIsNormal(builder->xmin));
|
||||
@@ -1302,8 +1301,8 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
|
||||
* currently running transactions have finished. We'll update both
|
||||
* while waiting for the pending transactions to finish.
|
||||
*/
|
||||
builder->xmin = running->nextXid; /* < are finished */
|
||||
builder->xmax = running->nextXid; /* >= are running */
|
||||
builder->xmin = running->nextXid; /* < are finished */
|
||||
builder->xmax = running->nextXid; /* >= are running */
|
||||
|
||||
/* so we can safely use the faster comparisons */
|
||||
Assert(TransactionIdIsNormal(builder->xmin));
|
||||
@@ -1688,7 +1687,7 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn)
|
||||
|
||||
INIT_CRC32C(checksum);
|
||||
COMP_CRC32C(checksum,
|
||||
((char *) &ondisk) + SnapBuildOnDiskNotChecksummedSize,
|
||||
((char *) &ondisk) + SnapBuildOnDiskNotChecksummedSize,
|
||||
SnapBuildOnDiskConstantSize - SnapBuildOnDiskNotChecksummedSize);
|
||||
|
||||
/* read SnapBuild */
|
||||
|
Reference in New Issue
Block a user