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/ginscan.c | |
| parent | 48c7d9f6ff99714495b7d6d2ebc44fbbe992cc8f (diff) | |
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/ginscan.c')
| -rw-r--r-- | src/backend/access/gin/ginscan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c index 9e22ed48a8f..a6604c4c934 100644 --- a/src/backend/access/gin/ginscan.c +++ b/src/backend/access/gin/ginscan.c @@ -75,7 +75,8 @@ fillScanKey(GinState *ginstate, GinScanKey key, OffsetNumber attnum, Datum query /* link to the equals entry in current scan key */ key->scanEntry[i].master = NULL; for (j = 0; j < i; j++) - if (compareEntries(ginstate, attnum, entryValues[i], entryValues[j]) == 0 && + if (ginCompareEntries(ginstate, attnum, + entryValues[i], entryValues[j]) == 0 && key->scanEntry[i].isPartialMatch == key->scanEntry[j].isPartialMatch && key->scanEntry[i].strategy == key->scanEntry[j].strategy) { @@ -155,7 +156,7 @@ freeScanKeys(GinScanKey keys, uint32 nkeys) } void -newScanKey(IndexScanDesc scan) +ginNewScanKey(IndexScanDesc scan) { ScanKey scankey = scan->keyData; GinScanOpaque so = (GinScanOpaque) scan->opaque; |