1
0
mirror of https://github.com/postgres/postgres.git synced 2025-11-09 06:21:09 +03:00

Revoke augmentation of WAL records for btree delete, per discussion.

This commit is contained in:
Simon Riggs
2010-02-01 13:40:28 +00:00
parent 9ea9918e37
commit 296578feb4
6 changed files with 14 additions and 48 deletions

View File

@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.116 2010/01/29 18:39:05 sriggs Exp $
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.117 2010/02/01 13:40:28 sriggs Exp $
*
* NOTES
* Postgres btree pages look like ordinary relation pages. The opaque
@@ -29,7 +29,6 @@
#include "storage/freespace.h"
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "storage/procarray.h"
#include "utils/inval.h"
#include "utils/snapmgr.h"
@@ -672,18 +671,9 @@ _bt_delitems(Relation rel, Buffer buf,
{
Page page = BufferGetPage(buf);
BTPageOpaque opaque;
TransactionId latestRemovedXid = InvalidTransactionId;
Assert(isVacuum || lastBlockVacuumed == 0);
/*
* If allowed, calculate an accurate latestRemovedXid, otherwise
* pass InvalidTransactionId which can cause false positive
* conflicts to be assessed when we replay this WAL record.
*/
if (!isVacuum && XLogStandbyInfoActive() && MinimizeStandbyConflicts)
latestRemovedXid = GetOldestXmin(false, true);
/* No ereport(ERROR) until changes are logged */
START_CRIT_SECTION();
@@ -731,7 +721,13 @@ _bt_delitems(Relation rel, Buffer buf,
xlrec_delete.node = rel->rd_node;
xlrec_delete.block = BufferGetBlockNumber(buf);
xlrec_delete.latestRemovedXid = latestRemovedXid;
/*
* XXX: We would like to set an accurate latestRemovedXid, but
* there is no easy way of obtaining a useful value. So we punt
* and store InvalidTransactionId, which forces the standby to
* wait for/cancel all currently running transactions.
*/
xlrec_delete.latestRemovedXid = InvalidTransactionId;
rdata[0].data = (char *) &xlrec_delete;
rdata[0].len = SizeOfBtreeDelete;
}