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/backend/access/gin/ginbulk.c | |
| 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/backend/access/gin/ginbulk.c')
| -rw-r--r-- | src/backend/access/gin/ginbulk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/access/gin/ginbulk.c b/src/backend/access/gin/ginbulk.c index 5d2dcbd31fd..83c8fe27a1b 100644 --- a/src/backend/access/gin/ginbulk.c +++ b/src/backend/access/gin/ginbulk.c @@ -48,7 +48,7 @@ ginCombineData(RBNode *existing, const RBNode *newdata, void *arg) { int res; - res = compareItemPointers(eo->list + eo->number - 1, en->list); + res = ginCompareItemPointers(eo->list + eo->number - 1, en->list); Assert(res != 0); if (res > 0) @@ -67,8 +67,8 @@ cmpEntryAccumulator(const RBNode *a, const RBNode *b, void *arg) const EntryAccumulator *eb = (const EntryAccumulator *) b; BuildAccumulator *accum = (BuildAccumulator *) arg; - return compareAttEntries(accum->ginstate, ea->attnum, ea->value, - eb->attnum, eb->value); + return ginCompareAttEntries(accum->ginstate, ea->attnum, ea->value, + eb->attnum, eb->value); } /* Allocator function for rbtree.c */ @@ -226,7 +226,7 @@ ginInsertRecordBA(BuildAccumulator *accum, ItemPointer heapptr, OffsetNumber att static int qsortCompareItemPointers(const void *a, const void *b) { - int res = compareItemPointers((ItemPointer) a, (ItemPointer) b); + int res = ginCompareItemPointers((ItemPointer) a, (ItemPointer) b); Assert(res != 0); return res; |