From bb42e21be274a71f6868ce2fc8fae2c15c3ecf66 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 24 Mar 2014 18:40:26 +0200 Subject: Change ginMergeItemPointers to return a palloc'd array. That seems nicer than making it the caller's responsibility to pass a suitable-sized array. All the callers were just palloc'ing an array anyway. --- src/include/access/gin_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/include/access/gin_private.h') diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h index 009927282f5..a7beed1f256 100644 --- a/src/include/access/gin_private.h +++ b/src/include/access/gin_private.h @@ -919,9 +919,9 @@ extern int ginPostingListDecodeAllSegmentsToTbm(GinPostingList *ptr, int totalsi extern ItemPointer ginPostingListDecodeAllSegments(GinPostingList *ptr, int len, int *ndecoded); extern ItemPointer ginPostingListDecode(GinPostingList *ptr, int *ndecoded); -extern int ginMergeItemPointers(ItemPointerData *dst, - ItemPointerData *a, uint32 na, - ItemPointerData *b, uint32 nb); +extern ItemPointer ginMergeItemPointers(ItemPointerData *a, uint32 na, + ItemPointerData *b, uint32 nb, + int *nmerged); /* * Merging the results of several gin scans compares item pointers a lot, -- cgit v1.2.3