diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-10-17 21:43:26 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-10-17 21:43:26 -0400 |
commit | 419d2374bfbc1eae562121fde31c1aa0e8a164cb (patch) | |
tree | 3c91e43520d82b3a1f3e79fa18bcc1a6f536d83b /src/include/access/gin.h | |
parent | 48c7d9f6ff99714495b7d6d2ebc44fbbe992cc8f (diff) | |
download | postgresql-419d2374bfbc1eae562121fde31c1aa0e8a164cb.tar.gz postgresql-419d2374bfbc1eae562121fde31c1aa0e8a164cb.zip |
Fix a passel of inappropriately-named global functions in GIN.
The GIN code has absolutely no business exporting GIN-specific functions
with names as generic as compareItemPointers() or newScanKey(); that's
just trouble waiting to happen. I got annoyed about this again just now
and decided to fix it. This commit ensures that all global symbols
defined in access/gin/ have names including "gin" or "Gin". There were a
couple of cases, like names involving "PostingItem", where arguably the
names were already sufficiently nongeneric; but I figured as long as I was
risking creating merge problems for unapplied GIN patches I might as well
impose a uniform policy.
I didn't touch any static symbol names. There might be some places
where it'd be appropriate to rename some static functions to match
siblings that are exported, but I'll leave that for another time.
Diffstat (limited to 'src/include/access/gin.h')
-rw-r--r-- | src/include/access/gin.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/include/access/gin.h b/src/include/access/gin.h index e6db073a055..e2d7b450c2a 100644 --- a/src/include/access/gin.h +++ b/src/include/access/gin.h @@ -362,12 +362,12 @@ extern Buffer GinNewBuffer(Relation index); extern void GinInitBuffer(Buffer b, uint32 f); extern void GinInitPage(Page page, uint32 f, Size pageSize); extern void GinInitMetabuffer(Buffer b); -extern int compareEntries(GinState *ginstate, OffsetNumber attnum, Datum a, Datum b); -extern int compareAttEntries(GinState *ginstate, OffsetNumber attnum_a, Datum a, +extern int ginCompareEntries(GinState *ginstate, OffsetNumber attnum, Datum a, Datum b); +extern int ginCompareAttEntries(GinState *ginstate, OffsetNumber attnum_a, Datum a, OffsetNumber attnum_b, Datum b); -extern Datum *extractEntriesS(GinState *ginstate, OffsetNumber attnum, Datum value, +extern Datum *ginExtractEntriesS(GinState *ginstate, OffsetNumber attnum, Datum value, int32 *nentries, bool *needUnique); -extern Datum *extractEntriesSU(GinState *ginstate, OffsetNumber attnum, Datum value, int32 *nentries); +extern Datum *ginExtractEntriesSU(GinState *ginstate, OffsetNumber attnum, Datum value, int32 *nentries); extern Datum gin_index_getattr(GinState *ginstate, IndexTuple tuple); extern OffsetNumber gintuple_get_attrnum(GinState *ginstate, IndexTuple tuple); @@ -460,26 +460,26 @@ extern GinBtreeStack *ginFindLeafPage(GinBtree btree, GinBtreeStack *stack); extern void freeGinBtreeStack(GinBtreeStack *stack); extern void ginInsertValue(GinBtree btree, GinBtreeStack *stack, GinStatsData *buildStats); -extern void findParents(GinBtree btree, GinBtreeStack *stack, BlockNumber rootBlkno); +extern void ginFindParents(GinBtree btree, GinBtreeStack *stack, BlockNumber rootBlkno); /* ginentrypage.c */ extern IndexTuple GinFormTuple(Relation index, GinState *ginstate, OffsetNumber attnum, Datum key, ItemPointerData *ipd, uint32 nipd, bool errorTooBig); extern void GinShortenTuple(IndexTuple itup, uint32 nipd); -extern void prepareEntryScan(GinBtree btree, Relation index, OffsetNumber attnum, +extern void ginPrepareEntryScan(GinBtree btree, Relation index, OffsetNumber attnum, Datum value, GinState *ginstate); -extern void entryFillRoot(GinBtree btree, Buffer root, Buffer lbuf, Buffer rbuf); +extern void ginEntryFillRoot(GinBtree btree, Buffer root, Buffer lbuf, Buffer rbuf); extern IndexTuple ginPageGetLinkItup(Buffer buf); /* gindatapage.c */ -extern int compareItemPointers(ItemPointer a, ItemPointer b); -extern uint32 MergeItemPointers(ItemPointerData *dst, +extern int ginCompareItemPointers(ItemPointer a, ItemPointer b); +extern uint32 ginMergeItemPointers(ItemPointerData *dst, ItemPointerData *a, uint32 na, ItemPointerData *b, uint32 nb); extern void GinDataPageAddItem(Page page, void *data, OffsetNumber offset); -extern void PageDeletePostingItem(Page page, OffsetNumber offset); +extern void GinPageDeletePostingItem(Page page, OffsetNumber offset); typedef struct { @@ -487,14 +487,14 @@ typedef struct GinBtreeStack *stack; } GinPostingTreeScan; -extern GinPostingTreeScan *prepareScanPostingTree(Relation index, +extern GinPostingTreeScan *ginPrepareScanPostingTree(Relation index, BlockNumber rootBlkno, bool searchMode); extern void ginInsertItemPointer(GinPostingTreeScan *gdi, ItemPointerData *items, uint32 nitem, GinStatsData *buildStats); -extern Buffer scanBeginPostingTree(GinPostingTreeScan *gdi); -extern void dataFillRoot(GinBtree btree, Buffer root, Buffer lbuf, Buffer rbuf); -extern void prepareDataScan(GinBtree btree, Relation index); +extern Buffer ginScanBeginPostingTree(GinPostingTreeScan *gdi); +extern void ginDataFillRoot(GinBtree btree, Buffer root, Buffer lbuf, Buffer rbuf); +extern void ginPrepareDataScan(GinBtree btree, Relation index); /* ginscan.c */ @@ -583,7 +583,7 @@ extern Datum ginendscan(PG_FUNCTION_ARGS); extern Datum ginrescan(PG_FUNCTION_ARGS); extern Datum ginmarkpos(PG_FUNCTION_ARGS); extern Datum ginrestrpos(PG_FUNCTION_ARGS); -extern void newScanKey(IndexScanDesc scan); +extern void ginNewScanKey(IndexScanDesc scan); /* ginget.c */ extern PGDLLIMPORT int GinFuzzySearchLimit; |