diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-04-08 01:26:33 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-04-08 01:26:33 +0000 |
| commit | 7b78474da35604152805b2fdd939326e1bc364da (patch) | |
| tree | 6d8d52106c1b10a596f761344b1cfa683a227b0e /src/backend/access/nbtree/nbtsort.c | |
| parent | 2fca2c05e7d22dfa1dd2cacf048243adfdf519ce (diff) | |
| download | postgresql-7b78474da35604152805b2fdd939326e1bc364da.tar.gz | |
Make CLUSTER MVCC-safe. Heikki Linnakangas
Diffstat (limited to 'src/backend/access/nbtree/nbtsort.c')
| -rw-r--r-- | src/backend/access/nbtree/nbtsort.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index a917e27a76..148b8e3266 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -57,13 +57,14 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.110 2007/01/09 02:14:10 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.111 2007/04/08 01:26:27 tgl Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" +#include "access/heapam.h" #include "access/nbtree.h" #include "miscadmin.h" #include "storage/smgr.h" @@ -265,32 +266,7 @@ _bt_blwritepage(BTWriteState *wstate, Page page, BlockNumber blkno) if (wstate->btws_use_wal) { /* We use the heap NEWPAGE record type for this */ - xl_heap_newpage xlrec; - XLogRecPtr recptr; - XLogRecData rdata[2]; - - /* NO ELOG(ERROR) from here till newpage op is logged */ - START_CRIT_SECTION(); - - xlrec.node = wstate->index->rd_node; - xlrec.blkno = blkno; - - rdata[0].data = (char *) &xlrec; - rdata[0].len = SizeOfHeapNewpage; - rdata[0].buffer = InvalidBuffer; - rdata[0].next = &(rdata[1]); - - rdata[1].data = (char *) page; - rdata[1].len = BLCKSZ; - rdata[1].buffer = InvalidBuffer; - rdata[1].next = NULL; - - recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_NEWPAGE, rdata); - - PageSetLSN(page, recptr); - PageSetTLI(page, ThisTimeLineID); - - END_CRIT_SECTION(); + log_newpage(&wstate->index->rd_node, blkno, page); } else { |