cleaning

Author: x4m

g.sh

@@ -225,8 +225,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 	XLogRecPtr	recptr;
 	int			i;
 	bool		is_split;
-	//elog(NOTICE,"GS: before placetopage check");
-	//gistcheckskippage(page);
 
 	/*
 	 * Refuse to modify a page that's incompletely split. This should not
@@ -277,9 +275,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 		bool		is_rootsplit;
 		int			npage;
 
-		//elog(NOTICE,"GS: gistplacetopage at %d skipoffnum %d", oldoffnum, skipoffnum);
-		//elog(NOTICE,"GS: Performing split");
-
 		is_rootsplit = (blkno == GIST_ROOT_BLKNO);
 
 		/*
@@ -302,14 +297,12 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 		{
 			/* on inner page we should remove old tuples */
 			int			pos = oldoffnum - FirstOffsetNumber;
-			//elog(NOTICE,"GS: shift extracted vector pos %d ndeltup %d tlen %d", pos, ndeltup, tlen);
 
 			tlen -= ndeltup;
 			if (pos != tlen)
 				memmove(itvec + pos, itvec + pos + ndeltup, sizeof(IndexTuple) * (tlen - pos));
 		}
 
-		//elog(NOTICE,"GS: join splitvector");
 		itvec = gistjoinvector(itvec, &tlen, itup, ntup, oldoffnum);
 
 		if (GistTupleIsSkip(*itvec))
@@ -319,9 +312,7 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 		if (dist == NULL)
 		{
 			gistfiltervector(itvec, &tlen);
-			//elog(NOTICE,"GS: calling extensions split");
 			dist = gistSplit(rel, page, itvec, tlen, giststate);
-			//elog(NOTICE,"GS: extension split done");
 		}
 
 		/*
@@ -391,7 +382,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 			IndexTuple *downlinks;
 			int			ndownlinks = 1;
 			int			i;
-			//elog(NOTICE,"GS: Ceatting new root");
 
 			rootpg.buffer = buffer;
 			rootpg.page = PageGetTempPageCopySpecial(BufferGetPage(rootpg.buffer));
@@ -418,7 +408,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 		}
 		else
 		{
-			//elog(NOTICE,"GS: not a root split");
 			/* Prepare split-info to be returned to caller */
 			for (ptr = dist; ptr; ptr = ptr->next)
 			{
@@ -429,7 +418,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 				*splitinfo = lappend(*splitinfo, si);
 			}
 		}
-		//elog(NOTICE,"GS: Formed newly splitted pages");
 
 		/*
 		 * Fill all pages. All the pages are new, ie. freshly allocated empty
@@ -455,8 +443,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 
 				data += IndexTupleSize(thistup);
 			}
-			//elog(NOTICE,"GS: checking page %p", ptr);
-			//gistcheckskippage(ptr->page);
 
 			/* Set up rightlinks */
 			if (ptr->next && ptr->block.blkno != GIST_ROOT_BLKNO)
@@ -485,7 +471,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 			 */
 			GistPageSetNSN(ptr->page, oldnsn);
 		}
-		//elog(NOTICE,"GS: written new pages");
 
 		/*
 		 * gistXLogSplit() needs to WAL log a lot of pages, prepare WAL
@@ -538,13 +523,9 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 			for (ptr = dist->next; ptr; ptr = ptr->next)
 				UnlockReleaseBuffer(ptr->buffer);
 		}
-		//elog(NOTICE,"GS: Split Done");
 	}
 	else
 	{
-		//if (!GistPageIsLeaf(page))
-		//	elog(NOTICE,"GS: gistplacetopage at %d skipoffnum %d", oldoffnum, skipoffnum);
-		//elog(NOTICE,"GS: just place");
 		/*
 		 * Enough space.  We always get here if ntup==0.
 		 */
@@ -555,8 +536,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 			IndexTuple skiptuple = (IndexTuple) PageGetItem(page, PageGetItemId(page, skipoffnum));
 			int newskipgroupsize = GistTupleGetSkipCount(skiptuple) + ntup - ndeltup;
 
-			//elog(NOTICE,"GS: adjust skipgroup at %d current size %d by %d newsize %d maxoff %d",skipoffnum, GistTupleGetSkipCount(skiptuple), ntup - ndeltup, newskipgroupsize, (int)PageGetMaxOffsetNumber(page));
-
 			Assert(GistTupleIsSkip(skiptuple));
 			Assert(skipoffnum + newskipgroupsize <= PageGetMaxOffsetNumber(page) + ntup - ndeltup);
 			GistTupleSetSkipCount(skiptuple, newskipgroupsize);
@@ -568,11 +547,9 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 		 */
 		if (OffsetNumberIsValid(oldoffnum))
 		{
-			//elog(NOTICE,"GS: place with overwrite");
 			int noverwrite = Min(ntup,ndeltup);
 			for (i = 0; i < noverwrite; i++)
 			{
-				//elog(NOTICE,"GS: overwrite %d at %d",i,oldoffnum + i);
 				if (!PageIndexTupleOverwrite(page, oldoffnum + i, (Item) itup[i],
 											 IndexTupleSize(*itup)))
 					elog(ERROR, "failed to add item to index page in \"%s\"",
@@ -582,12 +559,10 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 
 			for (i = noverwrite; i < ndeltup; i++)
 			{
-				//elog(NOTICE,"GS: delete %d", i);
 				PageIndexTupleDelete(page, oldoffnum + i);
 			}
 
 			gistfillbuffer(page, itup + noverwrite, ntup - noverwrite, oldoffnum + noverwrite);
-			//elog(NOTICE,"GS: place with overwrite done");
 		}
 		else
 		{
@@ -652,9 +627,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 	}
 
 	END_CRIT_SECTION();
-	//elog(NOTICE,"GS: place to page done");
-	//gistcheckskippage(page);
-	//elog(NOTICE,"GS: check done");
 
 	return is_split;
 }
@@ -693,7 +665,6 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
 	 */
 	for (;;)
 	{
-		//elog(NOTICE,"GS: insert cycle");
 		if (XLogRecPtrIsInvalid(stack->lsn))
 			stack->buffer = ReadBuffer(state.r, stack->blkno);
 
@@ -764,7 +735,6 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
 			OffsetNumber downlinkoffnum;
 
 			downlinkoffnum = gistchoose(state.r, stack->page, itup, giststate, &skipoffnum);
-			//elog(NOTICE,"GS: chosen %d skip %d", downlinkoffnum, skipoffnum);
 
 			if (OffsetNumberIsValid(skipoffnum))
 			{
@@ -905,11 +875,9 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
 			item->downlinkoffnum = downlinkoffnum;
 			item->skipoffnum = skipoffnum;
 			state.stack = stack = item;
-			//elog(NOTICE,"GS: descending");
 		}
 		else
 		{
-			//elog(NOTICE,"GS: leaf cycle");
 			/*
 			 * Leaf page. Insert the new key. We've already updated all the
 			 * parents on the way down, but we might have to split the page if
@@ -970,15 +938,12 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
 							InvalidOffsetNumber);
 			LockBuffer(stack->buffer, GIST_UNLOCK);
 
-			//elog(NOTICE,"GS: unpining");
-
 			/* Release any pins we might still hold before exiting */
 			for (; stack; stack = stack->parent)
 				ReleaseBuffer(stack->buffer);
 			break;
 		}
 	}
-	//elog(NOTICE,"GS: gistdoinsert done");
 }
 
 /*
@@ -1321,7 +1286,6 @@ static bool
 gistinserttuple(GISTInsertState *state, GISTInsertStack *stack,
 				GISTSTATE *giststate, IndexTuple tuple, OffsetNumber oldoffnum)
 {
-	//elog(NOTICE,"GS: gistinserttuple");
 	return gistinserttuples(state, stack, giststate, &tuple, 1, oldoffnum,
 							InvalidBuffer, InvalidBuffer, false, false, 1, InvalidOffsetNumber);
 }
@@ -1393,8 +1357,6 @@ gistinserttuples(GISTInsertState *state, GISTInsertStack *stack,
 	else if (unlockbuf)
 		LockBuffer(stack->buffer, GIST_UNLOCK);
 
-	//elog(NOTICE,"GS: gistinserttuples done");
-
 	return is_split;
 }
 
@@ -1414,7 +1376,6 @@ gistcheckskippage(Page page)
 
 		if (GistTupleIsSkip(tup))
 		{
-			//elog(NOTICE, "GS: Skip tuple count %d",GistTupleGetSkipCount(tup));
 			if (skiplast)
 			{
 				elog(NOTICE, "GS: at % d expecting %d more tuples but have skipgroup %d",i, skiplast,GistTupleGetSkipCount(tup));
@@ -1425,7 +1386,6 @@ gistcheckskippage(Page page)
 		}
 		else
 		{
-			//elog(NOTICE, "GS: not skip");
 			if (!wasskip)
 				continue;
 			if (skiplast<=0)
@@ -1445,8 +1405,7 @@ gisttestskipgroup(GISTInsertState *state, GISTInsertStack *stack,
 	Page		page = BufferGetPage(stack->buffer);
 	IndexTuple	skiptuple = (IndexTuple) PageGetItem(page, PageGetItemId(page, skipoffnum));
 	int			skipsize;
-	//elog(NOTICE,"GS: gisttestskipgroup begin at %d", skipoffnum);
-	//gistcheckskippage(page);
+
 	Assert(!GistPageIsLeaf(page));
 	Assert(GistTupleIsSkip(skiptuple));
 	skipsize = GistTupleGetSkipCount(skiptuple);
@@ -1478,8 +1437,6 @@ gisttestskipgroup(GISTInsertState *state, GISTInsertStack *stack,
 		gistinserttuples(state, stack, giststate, itvec, totalsize, skipoffnum,
 							InvalidBuffer, InvalidBuffer, false, false, skipsize + 1, InvalidOffsetNumber);
 	}
-	//elog(NOTICE,"GS: gisttestskipgroup end");
-	//gistcheckskippage(page);
 }
 
 /*
@@ -1566,11 +1523,9 @@ gistfinishsplit(GISTInsertState *state, GISTInsertStack *stack,
 					 1,
 					 stack->skipoffnum
 		);
-	if (stack->skipoffnum != InvalidOffsetNumber && !lastmomentsplit)
+	if (OffsetNumberIsValid(stack->skipoffnum) && !lastmomentsplit)
 		gisttestskipgroup(state,stack->parent, giststate, stack->skipoffnum);
 
-	//gistcheckskippage(BufferGetPage(stack->parent->buffer));
-	//elog(NOTICE,"GS: gistfinishsplit end");
 	LockBuffer(stack->parent->buffer, GIST_UNLOCK);
 	Assert(left->buf == stack->buffer);
 }
@@ -1612,9 +1567,7 @@ gistSplit(Relation r,
 
 	memset(v.spl_lisnull, true, sizeof(bool) * giststate->tupdesc->natts);
 	memset(v.spl_risnull, true, sizeof(bool) * giststate->tupdesc->natts);
-	//elog(NOTICE,"GS: calling split by key");
 	gistSplitByKey(r, page, itup, len, giststate, &v, 0);
-	//elog(NOTICE,"GS: split by key done");
 
 	/* form left and right vector */
 	lvectup = (IndexTuple *) palloc(sizeof(IndexTuple) * (len + 1));
@@ -1703,9 +1656,7 @@ gistSplitBySkipgroup(Relation r,
 
 	memset(v.spl_lisnull, true, sizeof(bool) * giststate->tupdesc->natts);
 	memset(v.spl_risnull, true, sizeof(bool) * giststate->tupdesc->natts);
-	//elog(NOTICE,"GS: gistSplitBySkipgroup calling split by key");
 	gistSplitByKey(r, page, skiptuples, skipcount, giststate, &v, 0);
-	//elog(NOTICE,"GS: split by key done left %d, right %d", v.splitVector.spl_nleft, v.splitVector.spl_nright);
 
 	/* form left and right vector */
 	lvectup = (IndexTuple *) palloc(sizeof(IndexTuple) * (len + 1));
@@ -1717,33 +1668,27 @@ gistSplitBySkipgroup(Relation r,
 		int index = skipoffsets[v.splitVector.spl_left[i] - 1];
 		Assert(GistTupleIsSkip(itup[index]));
 		int skipsize = GistTupleGetSkipCount(itup[index]);
-		//elog(NOTICE,"GS: skipsize %d", skipsize);
 		for (p = 0; p <= skipsize; p++)
 		{
-			//elog(NOTICE,"GS: step");
 			Assert(p==0 || !GistTupleIsSkip(itup[index + p]));
 			lvectup[o++] = itup[index + p];
 		}
 	}
 	v.splitVector.spl_nleft = o;
-	//elog(NOTICE,"GS: fill left %d", o);
 
 	o = 0;
 	for (i = 0; i < v.splitVector.spl_nright; i++)
 	{
 		int index = skipoffsets[v.splitVector.spl_right[i] - 1];
 		Assert(GistTupleIsSkip(itup[index]));
 		int skipsize = GistTupleGetSkipCount(itup[index]);
-		//elog(NOTICE,"GS: skipsize %d", skipsize);
 		for (p = 0; p <= skipsize; p++)
 		{
-			//elog(NOTICE,"GS: step");
 			Assert(p==0 || !GistTupleIsSkip(itup[index + p]));
 			rvectup[o++] = itup[index + p];
 		}
 	}
 	v.splitVector.spl_nright = o;
-	//elog(NOTICE,"GS: fill right %d", o);
 
 	/* finalize splitting (may need another split) */
 	if (!gistfitpage(rvectup, v.splitVector.spl_nright))
@@ -1783,7 +1728,6 @@ gistSplitBySkipgroup(Relation r,
 		res->list = gistfillitupvec(lvectup, v.splitVector.spl_nleft, &(res->lenlist));
 		res->itup = gistFormTuple(giststate, r, v.spl_lattr, v.spl_lisnull, false);
 	}
-	//elog(NOTICE,"GS: gistSplitBySkipgroup done");
 
 	return res;
 }

src/backend/access/gist/gist.c

@@ -334,12 +334,10 @@ gistScanPage(IndexScanDesc scan, GISTSearchItem *pageItem, double *myDistances,
 
 	Assert(!GISTSearchItemIsHeap(*pageItem));
 
-	//elog(NOTICE,"GS: scan page %d",pageItem->blkno);
 	buffer = ReadBuffer(scan->indexRelation, pageItem->blkno);
 	LockBuffer(buffer, GIST_SHARE);
 	gistcheckpage(scan->indexRelation, buffer);
 	page = BufferGetPage(buffer);
-	//gistcheckskippage(page);
 	TestForOldSnapshot(scan->xs_snapshot, r, page);
 	opaque = GistPageGetOpaque(page);
 
@@ -408,7 +406,6 @@ gistScanPage(IndexScanDesc scan, GISTSearchItem *pageItem, double *myDistances,
 			continue;
 
 		it = (IndexTuple) PageGetItem(page, iid);
-		//elog(NOTICE,"GS: item %d, skiptcount %d", i, GistTupleGetSkipCount(it));
 
 		/*
 		 * Must call gistindex_keytest in tempCxt, and clean up any leftover
@@ -425,15 +422,12 @@ gistScanPage(IndexScanDesc scan, GISTSearchItem *pageItem, double *myDistances,
 		/* Ignore tuple if it doesn't match */
 		if (!match)
 		{
-			//elog(NOTICE,"GS: not match");
 			if (GistTupleIsSkip(it))
 			{
-				//elog(NOTICE,"GS: skipping something %d", GistTupleGetSkipCount(it));
 				i += GistTupleGetSkipCount(it);
 			}
 			continue;
 		}
-		//elog(NOTICE,"GS: match");
 
 		if (GistTupleIsSkip(it))
 			continue;
@@ -653,7 +647,6 @@ gistgettuple(IndexScanDesc scan, ScanDirection dir)
 	{
 		/* Begin the scan by processing the root page */
 		GISTSearchItem fakeItem;
-		//elog(NOTICE,"GS: scan first call");
 
 		pgstat_count_index_scan(scan->indexRelation);
 

src/backend/access/gist/gistget.c

@@ -694,7 +694,6 @@ gistSplitByKey(Relation r, Page page, IndexTuple *itup, int len,
 		/*
 		 * All keys are not-null, so apply user-defined PickSplit method
 		 */
-		//elog(NOTICE,"GS: Call user picksplit");
 		if (gistUserPicksplit(r, entryvec, attno, v, itup, len, giststate))
 		{
 			/*