summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorHeikki Linnakangas2014-03-24 16:40:26 +0000
committerHeikki Linnakangas2014-03-24 16:44:40 +0000
commitbb42e21be274a71f6868ce2fc8fae2c15c3ecf66 (patch)
tree63cebcd2886c1b73f52c0f169fdbe0738ce30248 /src/include
parentcf5d38f4b9bcdf035c46ca8b3e5442557a21ef34 (diff)
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.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/access/gin_private.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index 009927282f..a7beed1f25 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,