database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-10 09:21:54 +03:00
Code

Correct sundry errors in Hot Standby-related comments.

Browse Source 
Fujii Masao
This commit is contained in:
Robert Haas 2010-08-12 23:24:54 +00:00
parent 00f76dbffa
commit 30c22eb8fc
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/access/transam/xact.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.295 2010/07/29 22:27:27 sriggs Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.296 2010/08/12 23:24:53 rhaas Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -4522,9 +4522,9 @@ xact_redo_abort(xl_xact_abort *xlrec, TransactionId xid)
sub_xids = (TransactionId *) &(xlrec->xnodes[xlrec->nrels]); sub_xids = (TransactionId *) &(xlrec->xnodes[xlrec->nrels]);
max_xid = TransactionIdLatest(xid, xlrec->nsubxacts, sub_xids); max_xid = TransactionIdLatest(xid, xlrec->nsubxacts, sub_xids);
/* Make sure nextXid is beyond any XID mentioned in the record */
/* /*
* Make sure nextXid is beyond any XID mentioned in the record.
*
* We don't expect anyone else to modify nextXid, hence we don't need to * We don't expect anyone else to modify nextXid, hence we don't need to
* hold a lock while checking this. We still acquire the lock to modify * hold a lock while checking this. We still acquire the lock to modify
* it, though. * it, though.

20
src/backend/storage/ipc/procarray.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.72 2010/07/06 19:18:57 momjian Exp $ * $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.73 2010/08/12 23:24:54 rhaas Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -449,7 +449,7 @@ ProcArrayInitRecoveryInfo(TransactionId oldestActiveXid)
/* /*
* ProcArrayApplyRecoveryInfo -- apply recovery info about xids * ProcArrayApplyRecoveryInfo -- apply recovery info about xids
* *
* Takes us through 3 states: Uninitialized, Pending and Ready. * Takes us through 3 states: Initialized, Pending and Ready.
* Normal case is to go all the way to Ready straight away, though there * Normal case is to go all the way to Ready straight away, though there
* are atypical cases where we need to take it in steps. * are atypical cases where we need to take it in steps.
* *
@ -487,7 +487,7 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
return; return;
/* /*
* If our initial RunningXactData had an overflowed snapshot then we knew * If our initial RunningTransactionsData had an overflowed snapshot then we knew
* we were missing some subxids from our snapshot. We can use this data as * we were missing some subxids from our snapshot. We can use this data as
* an initial snapshot, but we cannot yet mark it valid. We know that the * an initial snapshot, but we cannot yet mark it valid. We know that the
* missing subxids are equal to or earlier than nextXid. After we * missing subxids are equal to or earlier than nextXid. After we
@ -518,7 +518,7 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
Assert(standbyState == STANDBY_INITIALIZED); Assert(standbyState == STANDBY_INITIALIZED);
/* /*
* OK, we need to initialise from the RunningXactData record * OK, we need to initialise from the RunningTransactionsData record
*/ */
/* /*
@ -1499,7 +1499,7 @@ GetRunningTransactionData(void)
suboverflowed = true; suboverflowed = true;
/* /*
* Top-level XID of a transaction is always greater than any of * Top-level XID of a transaction is always less than any of
* its subxids, so we don't need to check if any of the subxids * its subxids, so we don't need to check if any of the subxids
* are smaller than oldestRunningXid * are smaller than oldestRunningXid
*/ */
@ -2313,7 +2313,7 @@ DisplayXidCache(void)
* aborted but we think they were running; the distinction is irrelevant * aborted but we think they were running; the distinction is irrelevant
* because either way any changes done by the transaction are not visible to * because either way any changes done by the transaction are not visible to
* backends in the standby. We prune KnownAssignedXids when * backends in the standby. We prune KnownAssignedXids when
* XLOG_XACT_RUNNING_XACTS arrives, to forestall possible overflow of the * XLOG_RUNNING_XACTS arrives, to forestall possible overflow of the
* array due to such dead XIDs. * array due to such dead XIDs.
*/ */
@ -2323,9 +2323,9 @@ DisplayXidCache(void)
* unobserved XIDs. * unobserved XIDs.
* *
* RecordKnownAssignedTransactionIds() should be run for *every* WAL record * RecordKnownAssignedTransactionIds() should be run for *every* WAL record
* type apart from XLOG_XACT_RUNNING_XACTS (since that initialises the first * type apart from XLOG_RUNNING_XACTS (since that initialises the first
* snapshot so that RecordKnownAssignedTransactionIds() can be called). Must * snapshot so that RecordKnownAssignedTransactionIds() can be called). Must
* be called for each record after we have executed StartupCLog() et al, * be called for each record after we have executed StartupCLOG() et al,
* since we must ExtendCLOG() etc.. * since we must ExtendCLOG() etc..
* *
* Called during recovery in analogy with and in place of GetNewTransactionId() * Called during recovery in analogy with and in place of GetNewTransactionId()
@ -3046,11 +3046,11 @@ KnownAssignedXidsDisplay(int trace_level)
if (KnownAssignedXidsValid[i]) if (KnownAssignedXidsValid[i])
{ {
nxids++; nxids++;
appendStringInfo(&buf, "[%u]=%u ", i, KnownAssignedXids[i]); appendStringInfo(&buf, "[%d]=%u ", i, KnownAssignedXids[i]);
} }
} }
elog(trace_level, "%d KnownAssignedXids (num=%u tail=%u head=%u) %s", elog(trace_level, "%d KnownAssignedXids (num=%d tail=%d head=%d) %s",
nxids, nxids,
pArray->numKnownAssignedXids, pArray->numKnownAssignedXids,
pArray->tailKnownAssignedXids, pArray->tailKnownAssignedXids,

8
src/backend/storage/ipc/standby.c
View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.27 2010/07/06 19:18:57 momjian Exp $ * $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.28 2010/08/12 23:24:54 rhaas Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -522,7 +522,7 @@ CheckRecoveryConflictDeadlock(LWLockId partitionLock)
* one transaction on one relation, and don't worry about lock queuing. * one transaction on one relation, and don't worry about lock queuing.
* *
* We keep a single dynamically expandible list of locks in local memory, * We keep a single dynamically expandible list of locks in local memory,
* RelationLockList, so we can keep track of the various entried made by * RelationLockList, so we can keep track of the various entries made by
* the Startup process's virtual xid in the shared lock table. * the Startup process's virtual xid in the shared lock table.
* *
* List elements use type xl_rel_lock, since the WAL record type exactly * List elements use type xl_rel_lock, since the WAL record type exactly
@ -700,7 +700,7 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record)
{ {
uint8 info = record->xl_info & ~XLR_INFO_MASK; uint8 info = record->xl_info & ~XLR_INFO_MASK;
/* Do nothing if we're not in standby mode */ /* Do nothing if we're not in hot standby mode */
if (standbyState == STANDBY_DISABLED) if (standbyState == STANDBY_DISABLED)
return; return;
@ -872,7 +872,7 @@ LogStandbySnapshot(TransactionId *oldestActiveXid, TransactionId *nextXid)
/* /*
* Record an enhanced snapshot of running transactions into WAL. * Record an enhanced snapshot of running transactions into WAL.
* *
* The definitions of RunningTransactionData and xl_xact_running_xacts * The definitions of RunningTransactionsData and xl_xact_running_xacts
* are similar. We keep them separate because xl_xact_running_xacts * are similar. We keep them separate because xl_xact_running_xacts
* is a contiguous chunk of memory and never exists fully until it is * is a contiguous chunk of memory and never exists fully until it is
* assembled in WAL. * assembled in WAL.

4
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.595 2010/07/06 19:18:57 momjian Exp $ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.596 2010/08/12 23:24:54 rhaas Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -2741,7 +2741,7 @@ SigHupHandler(SIGNAL_ARGS)
/* /*
* RecoveryConflictInterrupt: out-of-line portion of recovery conflict * RecoveryConflictInterrupt: out-of-line portion of recovery conflict
* handling ollowing receipt of SIGUSR1. Designed to be similar to die() * handling following receipt of SIGUSR1. Designed to be similar to die()
* and StatementCancelHandler(). Called only by a normal user backend * and StatementCancelHandler(). Called only by a normal user backend
* that begins a transaction during recovery. * that begins a transaction during recovery.
*/ */

4
src/include/access/xlog.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.115 2010/07/29 22:27:27 sriggs Exp $ * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.116 2010/08/12 23:24:54 rhaas Exp $
*/ */
#ifndef XLOG_H #ifndef XLOG_H
#define XLOG_H #define XLOG_H
@ -149,7 +149,7 @@ extern bool InRecovery;
* InHotStandby will read as FALSE). * InHotStandby will read as FALSE).
* *
* In DISABLED state, we're performing crash recovery or hot standby was * In DISABLED state, we're performing crash recovery or hot standby was
* disabled in recovery.conf. * disabled in postgresql.conf.
* *
* In INITIALIZED state, we've run InitRecoveryTransactionEnvironment, but * In INITIALIZED state, we've run InitRecoveryTransactionEnvironment, but
* we haven't yet processed a RUNNING_XACTS or shutdown-checkpoint WAL record * we haven't yet processed a RUNNING_XACTS or shutdown-checkpoint WAL record

4
src/include/catalog/pg_control.h
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.57 2010/06/03 20:37:13 alvherre Exp $ * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.58 2010/08/12 23:24:54 rhaas Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -45,7 +45,7 @@ typedef struct CheckPoint
/* /*
* Oldest XID still running. This is only needed to initialize hot standby * Oldest XID still running. This is only needed to initialize hot standby
* mode from an online checkpoint, so we only bother calculating this for * mode from an online checkpoint, so we only bother calculating this for
* online checkpoints and only when archiving is enabled. Otherwise it's * online checkpoints and only when wal_level is hot_standby. Otherwise it's
* set to InvalidTransactionId. * set to InvalidTransactionId.
*/ */
TransactionId oldestActiveXid; TransactionId oldestActiveXid;