Rename updateNodeLink to spgUpdateNodeLink.

tglsfdc · tglsfdc · commit 8f57b064fdaa · 2011-12-19T15:38:32.000-05:00
On reflection, the original name seems way too generic for a global
symbol.  A quick check shows this is the only exported function name
in SP-GiST that doesn't begin with "spg" or contain "SpGist", so the
rest of them seem all right.
diff --git a/src/backend/access/spgist/spgdoinsert.c b/src/backend/access/spgist/spgdoinsert.c
@@ -44,8 +44,8 @@ typedef struct SPPageDesc
  * split operation.
  */
 void
-updateNodeLink(SpGistInnerTuple tup, int nodeN,
-			   BlockNumber blkno, OffsetNumber offset)
+spgUpdateNodeLink(SpGistInnerTuple tup, int nodeN,
+				  BlockNumber blkno, OffsetNumber offset)
 {
 	int			i;
 	SpGistNodeTuple node;
@@ -190,7 +190,7 @@ saveNodeLink(Relation index, SPPageDesc *parent,
 	innerTuple = (SpGistInnerTuple) PageGetItem(parent->page,
 								PageGetItemId(parent->page, parent->offnum));
 
-	updateNodeLink(innerTuple, parent->node, blkno, offnum);
+	spgUpdateNodeLink(innerTuple, parent->node, blkno, offnum);
 
 	MarkBufferDirty(parent->buffer);
 }
@@ -1766,10 +1766,10 @@ spgSplitNodeAction(Relation index, SpGistState *state,
 	 * the postfix tuple first.)  We have to update the local copy of the
 	 * prefixTuple too, because that's what will be written to WAL.
 	 */
-	updateNodeLink(prefixTuple, 0, postfixBlkno, postfixOffset);
+	spgUpdateNodeLink(prefixTuple, 0, postfixBlkno, postfixOffset);
 	prefixTuple = (SpGistInnerTuple) PageGetItem(current->page,
 							  PageGetItemId(current->page, current->offnum));
-	updateNodeLink(prefixTuple, 0, postfixBlkno, postfixOffset);
+	spgUpdateNodeLink(prefixTuple, 0, postfixBlkno, postfixOffset);
 
 	MarkBufferDirty(current->buffer);
 
diff --git a/src/backend/access/spgist/spgxlog.c b/src/backend/access/spgist/spgxlog.c
@@ -172,8 +172,8 @@ spgRedoAddLeaf(XLogRecPtr lsn, XLogRecord *record)
 				tuple = (SpGistInnerTuple) PageGetItem(page,
 													   PageGetItemId(page, xldata->offnumParent));
 
-				updateNodeLink(tuple, xldata->nodeI,
-							   xldata->blknoLeaf, xldata->offnumLeaf);
+				spgUpdateNodeLink(tuple, xldata->nodeI,
+								  xldata->blknoLeaf, xldata->offnumLeaf);
 
 				PageSetLSN(page, lsn);
 				PageSetTLI(page, ThisTimeLineID);
@@ -277,8 +277,8 @@ spgRedoMoveLeafs(XLogRecPtr lsn, XLogRecord *record)
 				tuple = (SpGistInnerTuple) PageGetItem(page,
 													   PageGetItemId(page, xldata->offnumParent));
 
-				updateNodeLink(tuple, xldata->nodeI,
-							   xldata->blknoDst, toInsert[nInsert - 1]);
+				spgUpdateNodeLink(tuple, xldata->nodeI,
+								  xldata->blknoDst, toInsert[nInsert - 1]);
 
 				PageSetLSN(page, lsn);
 				PageSetTLI(page, ThisTimeLineID);
@@ -425,8 +425,8 @@ spgRedoAddNode(XLogRecPtr lsn, XLogRecord *record)
 					innerTuple = (SpGistInnerTuple) PageGetItem(page,
 																PageGetItemId(page, xldata->offnumParent));
 
-					updateNodeLink(innerTuple, xldata->nodeI,
-								   xldata->blknoNew, xldata->offnumNew);
+					spgUpdateNodeLink(innerTuple, xldata->nodeI,
+									  xldata->blknoNew, xldata->offnumNew);
 
 					PageSetLSN(page, lsn);
 					PageSetTLI(page, ThisTimeLineID);
@@ -692,8 +692,8 @@ spgRedoPickSplit(XLogRecPtr lsn, XLogRecord *record)
 
 					parent = (SpGistInnerTuple) PageGetItem(page,
 									PageGetItemId(page, xldata->offnumParent));
-					updateNodeLink(parent, xldata->nodeI,
-								   xldata->blknoInner, xldata->offnumInner);
+					spgUpdateNodeLink(parent, xldata->nodeI,
+									  xldata->blknoInner, xldata->offnumInner);
 				}
 
 				PageSetLSN(page, lsn);
@@ -727,8 +727,8 @@ spgRedoPickSplit(XLogRecPtr lsn, XLogRecord *record)
 
 					parent = (SpGistInnerTuple) PageGetItem(page,
 									PageGetItemId(page, xldata->offnumParent));
-					updateNodeLink(parent, xldata->nodeI,
-								   xldata->blknoInner, xldata->offnumInner);
+					spgUpdateNodeLink(parent, xldata->nodeI,
+									  xldata->blknoInner, xldata->offnumInner);
 
 					PageSetLSN(page, lsn);
 					PageSetTLI(page, ThisTimeLineID);
diff --git a/src/include/access/spgist_private.h b/src/include/access/spgist_private.h
@@ -610,8 +610,8 @@ extern OffsetNumber SpGistPageAddNewItem(SpGistState *state, Page page,
 					 bool errorOK);
 
 /* spgdoinsert.c */
-extern void updateNodeLink(SpGistInnerTuple tup, int nodeN,
-						   BlockNumber blkno, OffsetNumber offset);
+extern void spgUpdateNodeLink(SpGistInnerTuple tup, int nodeN,
+							  BlockNumber blkno, OffsetNumber offset);
 extern void spgPageIndexMultiDelete(SpGistState *state, Page page,
 						OffsetNumber *itemnos, int nitems,
 						int firststate, int reststate,
