1313#include "postgres.h"
1414
1515#include "access/genam.h"
16+ #include "bloom.h"
1617#include "catalog/storage.h"
1718#include "commands/vacuum.h"
1819#include "miscadmin.h"
2122#include "storage/indexfsm.h"
2223#include "storage/lmgr.h"
2324
24- #include "bloom.h"
2525
2626/*
2727 * Bulk deletion of all index entries pointing to a set of heap tuples.
@@ -42,6 +42,7 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
4242BloomState state ;
4343Buffer buffer ;
4444Page page ;
45+ BloomMetaPageData * metaData ;
4546GenericXLogState * gxlogState ;
4647
4748if (stats == NULL )
@@ -60,22 +61,27 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
6061* itupPtr ,
6162* itupEnd ;
6263
64+ vacuum_delay_point ();
65+
6366buffer = ReadBufferExtended (index ,MAIN_FORKNUM ,blkno ,
6467RBM_NORMAL ,info -> strategy );
6568
6669LockBuffer (buffer ,BUFFER_LOCK_EXCLUSIVE );
6770gxlogState = GenericXLogStart (index );
6871page = GenericXLogRegisterBuffer (gxlogState ,buffer ,0 );
6972
70- if (BloomPageIsDeleted (page ))
73+ /* Ignore empty/deleted pages until blvacuumcleanup() */
74+ if (PageIsNew (page )|| BloomPageIsDeleted (page ))
7175{
7276UnlockReleaseBuffer (buffer );
7377GenericXLogAbort (gxlogState );
74- CHECK_FOR_INTERRUPTS ();
7578continue ;
7679}
7780
78- /* Iterate over the tuples */
81+ /*
82+ * Iterate over the tuples. itup points to current tuple being
83+ * scanned, itupPtr points to where to save next non-deleted tuple.
84+ */
7985itup = itupPtr = BloomPageGetTuple (& state ,page ,FirstOffsetNumber );
8086itupEnd = BloomPageGetTuple (& state ,page ,
8187OffsetNumberNext (BloomPageGetMaxOffset (page )));
@@ -84,36 +90,32 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
8490/* Do we have to delete this tuple? */
8591if (callback (& itup -> heapPtr ,callback_state ))
8692{
87- stats -> tuples_removed += 1 ;
93+ /* Yes; adjust count of tuples that will be left on page */
8894BloomPageGetOpaque (page )-> maxoff -- ;
95+ stats -> tuples_removed += 1 ;
8996}
9097else
9198{
99+ /* No; copy it to itupPtr++, but skip copy if not needed */
92100if (itupPtr != itup )
93- {
94- /*
95- * If we already delete something before, we have to move
96- * this tuple backward.
97- */
98101memmove ((Pointer )itupPtr , (Pointer )itup ,
99102state .sizeOfBloomTuple );
100- }
101- stats -> num_index_tuples ++ ;
102103itupPtr = BloomPageGetNextTuple (& state ,itupPtr );
103104}
104105
105106itup = BloomPageGetNextTuple (& state ,itup );
106107}
107108
109+ /* Assert that we counted correctly */
108110Assert (itupPtr == BloomPageGetTuple (& state ,page ,
109111OffsetNumberNext (BloomPageGetMaxOffset (page ))));
110112
111113/*
112- * Add page to notFullPage list if we will not mark page as deleted
113- * and there is a free space on it
114+ * Add page tonew notFullPage list if we will not mark page as
115+ *deleted and there is free space on it
114116 */
115117if (BloomPageGetMaxOffset (page )!= 0 &&
116- BloomPageGetFreeSpace (& state ,page )> state .sizeOfBloomTuple &&
118+ BloomPageGetFreeSpace (& state ,page ) >= state .sizeOfBloomTuple &&
117119countPage < BloomMetaBlockN )
118120notFullPage [countPage ++ ]= blkno ;
119121
@@ -134,27 +136,26 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
134136GenericXLogAbort (gxlogState );
135137}
136138UnlockReleaseBuffer (buffer );
137- CHECK_FOR_INTERRUPTS ();
138139}
139140
140- if (countPage > 0 )
141- {
142- BloomMetaPageData * metaData ;
143-
144- buffer = ReadBuffer (index ,BLOOM_METAPAGE_BLKNO );
145- LockBuffer (buffer ,BUFFER_LOCK_EXCLUSIVE );
141+ /*
142+ * Update the metapage's notFullPage list with whatever we found. Our
143+ * info could already be out of date at this point, but blinsert() will
144+ * cope if so.
145+ */
146+ buffer = ReadBuffer (index ,BLOOM_METAPAGE_BLKNO );
147+ LockBuffer (buffer ,BUFFER_LOCK_EXCLUSIVE );
146148
147- gxlogState = GenericXLogStart (index );
148- page = GenericXLogRegisterBuffer (gxlogState ,buffer ,0 );
149+ gxlogState = GenericXLogStart (index );
150+ page = GenericXLogRegisterBuffer (gxlogState ,buffer ,0 );
149151
150- metaData = BloomPageGetMeta (page );
151- memcpy (metaData -> notFullPage ,notFullPage ,sizeof (BlockNumber )* countPage );
152- metaData -> nStart = 0 ;
153- metaData -> nEnd = countPage ;
152+ metaData = BloomPageGetMeta (page );
153+ memcpy (metaData -> notFullPage ,notFullPage ,sizeof (BlockNumber )* countPage );
154+ metaData -> nStart = 0 ;
155+ metaData -> nEnd = countPage ;
154156
155- GenericXLogFinish (gxlogState );
156- UnlockReleaseBuffer (buffer );
157- }
157+ GenericXLogFinish (gxlogState );
158+ UnlockReleaseBuffer (buffer );
158159
159160return stats ;
160161}
@@ -170,7 +171,6 @@ blvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
170171Relation index = info -> index ;
171172BlockNumber npages ,
172173blkno ;
173- BlockNumber totFreePages ;
174174
175175if (info -> analyze_only )
176176return stats ;
@@ -183,7 +183,9 @@ blvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
183183 * statistics.
184184 */
185185npages = RelationGetNumberOfBlocks (index );
186- totFreePages = 0 ;
186+ stats -> num_pages = npages ;
187+ stats -> pages_free = 0 ;
188+ stats -> num_index_tuples = 0 ;
187189for (blkno = BLOOM_HEAD_BLKNO ;blkno < npages ;blkno ++ )
188190{
189191Buffer buffer ;
@@ -196,23 +198,20 @@ blvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
196198LockBuffer (buffer ,BUFFER_LOCK_SHARE );
197199page = (Page )BufferGetPage (buffer );
198200
199- if (BloomPageIsDeleted (page ))
201+ if (PageIsNew ( page ) || BloomPageIsDeleted (page ))
200202{
201203RecordFreeIndexPage (index ,blkno );
202- totFreePages ++ ;
204+ stats -> pages_free ++ ;
203205}
204206else
205207{
206208stats -> num_index_tuples += BloomPageGetMaxOffset (page );
207- stats -> estimated_count += BloomPageGetMaxOffset (page );
208209}
209210
210211UnlockReleaseBuffer (buffer );
211212}
212213
213214IndexFreeSpaceMapVacuum (info -> index );
214- stats -> pages_free = totFreePages ;
215- stats -> num_pages = RelationGetNumberOfBlocks (index );
216215
217216return stats ;
218217}