Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb04d97d

Browse files
committed
typos and clenup
1 parentf637edc commitb04d97d

File tree

3 files changed

+41
-34
lines changed

3 files changed

+41
-34
lines changed

‎src/backend/access/transam/twophase.c

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ static bool twophaseExitRegistered = false;
192192
*
193193
* Replay of twophase records happens by the following rules:
194194
** On PREPARE redo KnownPreparedAdd() is called to add that transaction to
195-
* KnownPreparedList and no more actions taken.
196-
** On checkpoint we iterate through KnownPreparedList, move all prepare
197-
* records that behind redo_horizon tofile and deletingitems from list.
195+
* KnownPreparedList and no more actionsaretaken.
196+
** On checkpointredowe iterate through KnownPreparedList and move all prepare
197+
* records that behind redo_horizon tofiles and deletingthem from list.
198198
** On COMMIT/ABORT we delete file or entry in KnownPreparedList.
199199
** At the end of recovery we move all known prepared transactions to disk
200200
* to allow RecoverPreparedTransactions/StandbyRecoverPreparedTransactions
@@ -1270,9 +1270,9 @@ ReadTwoPhaseFile(TransactionId xid, bool give_warnings)
12701270
* Reads 2PC data from xlog. During checkpoint this data will be moved to
12711271
* twophase files and ReadTwoPhaseFile should be used instead.
12721272
*
1273-
* Note clearly that this functionaccesses WAL during normal operation, similarly
1274-
* to the way WALSender or Logical Decoding would do. It does not run during
1275-
* crash recovery or standby processing.
1273+
* Note clearly that this functioncan access WAL during normal operation, similarly
1274+
* to the way WALSender or Logical Decoding would do.
1275+
*
12761276
*/
12771277
staticvoid
12781278
XlogReadTwoPhaseData(XLogRecPtrlsn,char**buf,int*len)
@@ -1281,8 +1281,6 @@ XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)
12811281
XLogReaderState*xlogreader;
12821282
char*errormsg;
12831283

1284-
// Assert(!RecoveryInProgress());
1285-
12861284
xlogreader=XLogReaderAllocate(&read_local_xlog_page,NULL);
12871285
if (!xlogreader)
12881286
ereport(ERROR,
@@ -1682,27 +1680,6 @@ CheckPointTwoPhase(XLogRecPtr redo_horizon)
16821680
serialized_xacts)));
16831681
}
16841682

1685-
/*
1686-
* KnownPreparedAdd.
1687-
*
1688-
* Store correspondence of start/end lsn and xid in KnownPreparedList.
1689-
* This is called during redo of prepare record to have list of prepared
1690-
* transactions that aren't yet moved to 2PC files by the end of recovery.
1691-
*/
1692-
void
1693-
KnownPreparedAdd(XLogReaderState*record)
1694-
{
1695-
KnownPreparedXact*xact;
1696-
TwoPhaseFileHeader*hdr= (TwoPhaseFileHeader*)XLogRecGetData(record);
1697-
1698-
xact= (KnownPreparedXact*)palloc(sizeof(KnownPreparedXact));
1699-
xact->xid=hdr->xid;
1700-
xact->prepare_start_lsn=record->ReadRecPtr;
1701-
xact->prepare_end_lsn=record->EndRecPtr;
1702-
1703-
dlist_push_tail(&KnownPreparedList,&xact->list_node);
1704-
}
1705-
17061683
/*
17071684
* PrescanPreparedTransactions
17081685
*
@@ -1741,6 +1718,13 @@ PrescanPreparedTransactions(TransactionId **xids_p, int *nxids_p)
17411718
intnxids=0;
17421719
intallocsize=0;
17431720

1721+
/*
1722+
* Move prepared transactions from KnownPreparedList to files, if any.
1723+
* It is possible to skip that step and teach subsequent code about
1724+
* KnownPreparedList, but whole PrescanPreparedTransactions() happens
1725+
* once during end of recovery or promote, so probably it isn't worth
1726+
* complications.
1727+
*/
17441728
KnownPreparedRecreateFiles(InvalidXLogRecPtr);
17451729

17461730
cldir=AllocateDir(TWOPHASE_DIR);
@@ -2215,10 +2199,33 @@ RecordTransactionAbortPrepared(TransactionId xid,
22152199
SyncRepWaitForLSN(recptr, false);
22162200
}
22172201

2202+
/*
2203+
* KnownPreparedAdd.
2204+
*
2205+
* Store correspondence of start/end lsn and xid in KnownPreparedList.
2206+
* This is called during redo of prepare record to have list of prepared
2207+
* transactions that aren't yet moved to 2PC files by the end of recovery.
2208+
*/
2209+
void
2210+
KnownPreparedAdd(XLogReaderState*record)
2211+
{
2212+
KnownPreparedXact*xact;
2213+
TwoPhaseFileHeader*hdr= (TwoPhaseFileHeader*)XLogRecGetData(record);
2214+
2215+
Assert(RecoveryInProgress());
2216+
2217+
xact= (KnownPreparedXact*)palloc(sizeof(KnownPreparedXact));
2218+
xact->xid=hdr->xid;
2219+
xact->prepare_start_lsn=record->ReadRecPtr;
2220+
xact->prepare_end_lsn=record->EndRecPtr;
2221+
2222+
dlist_push_tail(&KnownPreparedList,&xact->list_node);
2223+
}
2224+
22182225
/*
22192226
* KnownPreparedRemoveByXid
22202227
*
2221-
* Forget about prepared transaction. Calleddurind commit/abort.
2228+
* Forget about prepared transaction. Calledduring commit/abort redo.
22222229
*/
22232230
void
22242231
KnownPreparedRemoveByXid(TransactionIdxid)
@@ -2254,7 +2261,7 @@ KnownPreparedRemoveByXid(TransactionId xid)
22542261
/*
22552262
* KnownPreparedRecreateFiles
22562263
*
2257-
* Moves prepare records from WAL to files.Callend during checkpoint replay
2264+
* Moves prepare records from WAL to files.Called during checkpoint replay
22582265
* or PrescanPreparedTransactions.
22592266
*
22602267
* redo_horizon = InvalidXLogRecPtr indicates that all transactions from

‎src/backend/access/transam/xact.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5634,7 +5634,7 @@ xact_redo(XLogReaderState *record)
56345634
elseif (info==XLOG_XACT_PREPARE)
56355635
{
56365636
/*
5637-
* If that transaction will not becommited by the end of recovery then we
5637+
* If that transaction will not becommitted by the end of recovery then we
56385638
* will need 2PC file (the record contents is exactly the 2PC file) to be able
56395639
* to commit that later.
56405640
* For now store xid and pointers to that record in KnownPreparedList.

‎src/test/recovery/t/000_twophase.plrenamed to‎src/test/recovery/t/009_twophase.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258

259259

260260
###############################################################################
261-
# Check for a lockconfcict between prepared tx with DDL inside and replay of
261+
# Check for a lockconflict between prepared tx with DDL inside and replay of
262262
# XLOG_STANDBY_LOCK wal record.
263263
###############################################################################
264264

@@ -279,7 +279,7 @@
279279

280280

281281
###############################################################################
282-
# Check that replay will correctly set SUBTRANS and properlyandvance nextXid
282+
# Check that replay will correctly set SUBTRANS and properlyadvance nextXid
283283
# so it won't conflict with savepoint xids.
284284
###############################################################################
285285

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp