prettifing

Author: x4m

src/backend/access/gist/gistvacuum.c

@@ -108,21 +108,6 @@ typedef struct GistBDItem
 	struct GistBDItem *next;
 } GistBDItem;
 
-typedef enum
-{
-	NOT_NEED_TO_PROCESS,	/* without action */
-	PROCESSED,				/* action is done */
-	NEED_TO_PROCESS,
-	NEED_TO_DELETE
-} GistBlockInfoFlag;
-
-typedef struct GistBlockInfo {
-	BlockNumber parent;
-	BlockNumber leftblock;		/* block that has rightlink on blkno */
-	GistBlockInfoFlag flag;
-	bool hasRightLink;
-} GistBlockInfo;
-
 static void
 pushStackIfSplited(Page page, GistBDItem *stack)
 {
@@ -296,8 +281,6 @@ gistbulkdelete(IndexVacuumInfo * info, IndexBulkDeleteResult * stats, IndexBulkD
 		vacuum_delay_point();
 	}
 
-
-	elog(NOTICE,"Rescan list length %d", length(rescanList));
 	/* rescan inner pages that had empty child pages */
 	foreach(cell,rescanList)
 	{
@@ -311,7 +294,6 @@ gistbulkdelete(IndexVacuumInfo * info, IndexBulkDeleteResult * stats, IndexBulkD
 		Buffer		buftodelete[MaxOffsetNumber];
 		int			ntodelete = 0;
 
-		elog(NOTICE,"Deleting for inner %d",(BlockNumber)lfirst_int(cell));
 		buffer = ReadBufferExtended(rel, MAIN_FORKNUM, (BlockNumber)lfirst_int(cell),
 									RBM_NORMAL, info->strategy);
 		LockBuffer(buffer, GIST_EXCLUSIVE);
@@ -322,7 +304,7 @@ gistbulkdelete(IndexVacuumInfo * info, IndexBulkDeleteResult * stats, IndexBulkD
 
 		maxoff = PageGetMaxOffsetNumber(page);
 
-		for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
+		for (i = OffsetNumberNext(FirstOffsetNumber); i <= maxoff; i = OffsetNumberNext(i))
 			{
 				Buffer		leafBuffer;
 				Page		leafPage;
@@ -335,9 +317,11 @@ gistbulkdelete(IndexVacuumInfo * info, IndexBulkDeleteResult * stats, IndexBulkD
 				LockBuffer(leafBuffer, GIST_EXCLUSIVE);
 				gistcheckpage(rel, leafBuffer);
 				leafPage = (Page) BufferGetPage(leafBuffer);
+				Assert(GistPageIsLeaf(leafPage));
 
-				if (PageGetMaxOffsetNumber(leafPage) == InvalidOffsetNumber
-					&& !(GistFollowRight(leafPage) || GistPageGetNSN(page) < GistPageGetNSN(leafPage)))
+				if (PageGetMaxOffsetNumber(leafPage) == InvalidOffsetNumber /* Nothing left to split */
+					&& !(GistFollowRight(leafPage) || GistPageGetNSN(page) < GistPageGetNSN(leafPage)) /* No follow-right */
+					&& ntodelete < maxoff-1) /* We must keep at leaf one leaf page per each */
 				{
 					buftodelete[ntodelete] = leafBuffer;
 					todelete[ntodelete++] = i;
@@ -347,51 +331,48 @@ gistbulkdelete(IndexVacuumInfo * info, IndexBulkDeleteResult * stats, IndexBulkD
 			}
 
 		if (ntodelete)
-			{
-				START_CRIT_SECTION();
-
-				MarkBufferDirty(buffer);
+		{
+			/* Drop references from internal page */
+			TransactionId txid = GetCurrentTransactionId();
+			START_CRIT_SECTION();
 
+			MarkBufferDirty(buffer);
 				PageIndexMultiDelete(page, todelete, ntodelete);
-				GistMarkTuplesDeleted(page);
 
-				if (RelationNeedsWAL(rel))
-				{
-					XLogRecPtr	recptr;
+			if (RelationNeedsWAL(rel))
+			{
+				XLogRecPtr	recptr;
 
-					recptr = gistXLogUpdate(buffer,
-											todelete, ntodelete,
-											NULL, 0, InvalidBuffer);
+				recptr = gistXLogUpdate(buffer, todelete, ntodelete, NULL, 0, InvalidBuffer);
 					PageSetLSN(page, recptr);
-				}
-				else
-					PageSetLSN(page, gistGetFakeLSN(rel));
-
-				END_CRIT_SECTION();
-				
-				for (i = 0; i < ntodelete; i++)
-				{
-					Page		leafPage = (Page)BufferGetPage(buftodelete[i]);
-					PageHeader	header = (PageHeader)leafPage;
+			}
+			else
+				PageSetLSN(page, gistGetFakeLSN(rel));
 
-					header->pd_prune_xid = GetCurrentTransactionId();
+			/* Mark pages as deleted */
+			for (i = 0; i < ntodelete; i++)
+			{
+				Page		leafPage = (Page)BufferGetPage(buftodelete[i]);
+				PageHeader	header = (PageHeader)leafPage;
 
-					GistPageSetDeleted(leafPage);
-					stats->pages_deleted++;
+				header->pd_prune_xid = txid;
 
-					if (RelationNeedsWAL(rel))
-					{
-						XLogRecPtr recptr;
+				GistPageSetDeleted(leafPage);
+				MarkBufferDirty(buftodelete[i]);
+				stats->pages_deleted++;
 
-						recptr = gistXLogSetDeleted(rel->rd_node, buftodelete[i], header->pd_prune_xid);
-						PageSetLSN(leafPage, recptr);
-					} 
-					else
-						PageSetLSN(leafPage, gistGetFakeLSN(rel));
+				if (RelationNeedsWAL(rel))
+				{
+					XLogRecPtr recptr = gistXLogSetDeleted(rel->rd_node, buftodelete[i], header->pd_prune_xid);
+					PageSetLSN(leafPage, recptr);
+				} 
+				else
+					PageSetLSN(leafPage, gistGetFakeLSN(rel));
 
-					UnlockReleaseBuffer(buftodelete[i]);
-				}
+				UnlockReleaseBuffer(buftodelete[i]);
 			}
+			END_CRIT_SECTION();
+		}
 
 		UnlockReleaseBuffer(buffer);
 	}

src/backend/access/gist/gistxlog.c

@@ -60,27 +60,6 @@ gistRedoClearFollowRight(XLogReaderState *record, uint8 block_id)
 		UnlockReleaseBuffer(buffer);
 }
 
-static void
-gistRedoRightlinkChange(XLogReaderState *record)
-{
-	XLogRecPtr	lsn = record->EndRecPtr;
-	gistxlogPageRightlinkChange *xldata = (gistxlogPageRightlinkChange *) XLogRecGetData(record);
-	Buffer		buffer;
-	Page		page;
-	BlockNumber	newright;
-	GISTPageOpaque opaque;
-
-	if (XLogReadBufferForRedo(record, 0, &buffer) == BLK_NEEDS_REDO)
-	{
-		newright = xldata->newRightLink;
-		page = BufferGetPage(buffer);
-		opaque = GistPageGetOpaque(page);
-		opaque->rightlink = newright;
-		PageSetLSN(page, lsn);
-		MarkBufferDirty(buffer);
-	}
-}
-
 static void
 gistRedoPageSetDeleted(XLogReaderState *record)
 {
@@ -370,9 +349,6 @@ gist_redo(XLogReaderState *record)
 		case XLOG_GIST_PAGE_DELETE:
 			gistRedoPageSetDeleted(record);
 			break;
-		case XLOG_GIST_RIGHTLINK_CHANGE:
-			gistRedoRightlinkChange(record);
-			break;
 		default:
 			elog(PANIC, "gist_redo: unknown op code %u", info);
 	}
@@ -508,24 +484,6 @@ gistXLogSetDeleted(RelFileNode node, Buffer buffer, TransactionId xid) {
 	return recptr;
 }
 
-XLogRecPtr
-gistXLogRightLinkChange(RelFileNode node, Buffer buffer,
-					BlockNumber newRightLink)
-{
-	gistxlogPageRightlinkChange xlrec;
-	XLogRecPtr	recptr;
-
-	xlrec.newRightLink = newRightLink;
-
-	XLogBeginInsert();
-	XLogRegisterData((char *) &xlrec, sizeof(gistxlogPageRightlinkChange));
-
-	XLogRegisterBuffer(0, buffer, REGBUF_STANDARD);
-	/* new tuples */
-	recptr = XLogInsert(RM_GIST_ID, XLOG_GIST_RIGHTLINK_CHANGE);
-	return recptr;
-}
-
 /*
  * Write XLOG record describing a page update. The update can include any
  * number of deletions and/or insertions of tuples on a single index page.

src/include/access/gist_private.h

@@ -418,9 +418,6 @@ extern void gist_xlog_cleanup(void);
 extern XLogRecPtr gistXLogSetDeleted(RelFileNode node, Buffer buffer,
 					TransactionId xid);
 
-extern XLogRecPtr gistXLogRightLinkChange(RelFileNode node, Buffer buffer,
-					BlockNumber newRightLink) ;
-
 extern XLogRecPtr gistXLogUpdate(Buffer buffer,
 			   OffsetNumber *todelete, int ntodelete,
 			   IndexTuple *itup, int ntup,

src/include/access/gistxlog.h

@@ -25,7 +25,6 @@
  /* #define XLOG_GIST_INSERT_COMPLETE	 0x40 */	/* not used anymore */
 #define XLOG_GIST_CREATE_INDEX		0x50
 #define XLOG_GIST_PAGE_DELETE		 0x60
-#define XLOG_GIST_RIGHTLINK_CHANGE		 0x70
 
 /*
  * Backup Blk 0: updated page.
@@ -67,13 +66,6 @@ typedef struct gistxlogPageDelete
    TransactionId id;
 } gistxlogPageDelete;
 
-typedef struct gistxlogPageRightlinkChange
-{
-   BlockNumber newRightLink;
-
-} gistxlogPageRightlinkChange;
-
-
 /* despite the name, gistxlogPage is not part of any xlog record */
 typedef struct gistxlogPage
 {