Commit 708f67c7 authored by Vadim B. Mikheev's avatar Vadim B. Mikheev

Blowaway relation buffers from buffer pool before truncation.

parent 94e52d38
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.47 1997/09/12 04:07:30 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.48 1997/09/22 07:12:33 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
#include <port-protos.h> #include <port-protos.h>
extern int BlowawayRelationBuffers(Relation rdesc, BlockNumber block);
bool VacuumRunning = false; bool VacuumRunning = false;
static Portal vc_portal; static Portal vc_portal;
...@@ -1394,6 +1396,9 @@ Elapsed %u/%u sec.", ...@@ -1394,6 +1396,9 @@ Elapsed %u/%u sec.",
/* truncate relation */ /* truncate relation */
if (blkno < nblocks) if (blkno < nblocks)
{ {
i = BlowawayRelationBuffers(onerel, blkno);
if (i < 0)
elog (FATAL, "VACUUM (vc_rpfheap): BlowawayRelationBuffers returned %d", i);
blkno = smgrtruncate(onerel->rd_rel->relsmgr, onerel, blkno); blkno = smgrtruncate(onerel->rd_rel->relsmgr, onerel, blkno);
Assert(blkno >= 0); Assert(blkno >= 0);
vacrelstats->npages = blkno; /* set new number of blocks */ vacrelstats->npages = blkno; /* set new number of blocks */
...@@ -1465,6 +1470,10 @@ vc_vacheap(VRelStats *vacrelstats, Relation onerel, VPageList Vvpl) ...@@ -1465,6 +1470,10 @@ vc_vacheap(VRelStats *vacrelstats, Relation onerel, VPageList Vvpl)
* it) before truncation * it) before truncation
*/ */
FlushBufferPool(!TransactionFlushEnabled()); FlushBufferPool(!TransactionFlushEnabled());
i = BlowawayRelationBuffers(onerel, nblocks);
if (i < 0)
elog (FATAL, "VACUUM (vc_vacheap): BlowawayRelationBuffers returned %d", i);
nblocks = smgrtruncate(onerel->rd_rel->relsmgr, onerel, nblocks); nblocks = smgrtruncate(onerel->rd_rel->relsmgr, onerel, nblocks);
Assert(nblocks >= 0); Assert(nblocks >= 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment