Fixes:

 - correct use of compareRumKey
 - select with both restrions on addto and orderby columns
 - rework scankeys placement to easify filtering of addinfo in future

Author: feodor

rum.h

@@ -461,15 +461,16 @@ typedef struct RumBtreeData
 
 	BlockNumber rightblkno;
 
+	AttrNumber	entryAttnum;
+
 	/* Entry options */
-	OffsetNumber entryAttnum;
 	Datum		entryKey;
 	RumNullCategory entryCategory;
 	IndexTuple	entry;
 	bool		isDelete;
 
 	/* Data (posting tree) options */
-	RumKey	   *items;
+	RumKey		*items;
 
 	uint32		nitem;
 	uint32		curitem;
@@ -502,14 +503,17 @@ extern void checkLeafDataPage(RumState * rumstate, AttrNumber attrnum, Page page
 
 /* rumdatapage.c */
 extern int	rumCompareItemPointers(const ItemPointerData *a, const ItemPointerData *b);
-extern int	compareRumKey(RumState * state, const RumKey * a, const RumKey * b);
+extern int	compareRumKey(RumState * state, const AttrNumber attno,
+						  const RumKey * a, const RumKey * b);
 extern void convertIndexToKey(RumDataLeafItemIndex *src, RumKey *dst);
 extern Pointer rumPlaceToDataPageLeaf(Pointer ptr, OffsetNumber attnum,
 					   RumKey * item, ItemPointer prev, RumState * rumstate);
 extern Size rumCheckPlaceToDataPageLeaf(OffsetNumber attnum,
 			RumKey * item, ItemPointer prev, RumState * rumstate, Size size);
-extern uint32 rumMergeItemPointers(RumState * rumstate, RumKey * dst,
-					 RumKey * a, uint32 na, RumKey * b, uint32 nb);
+extern uint32 rumMergeItemPointers(RumState * rumstate, AttrNumber attno,
+								   RumKey * dst,
+								   RumKey * a, uint32 na,
+								   RumKey * b, uint32 nb);
 extern void RumDataPageAddItem(Page page, void *data, OffsetNumber offset);
 extern void RumPageDeletePostingItem(Page page, OffsetNumber offset);
 
@@ -579,6 +583,7 @@ typedef struct RumScanKeyData
 	StrategyNumber strategy;
 	int32		searchMode;
 	OffsetNumber attnum;
+	OffsetNumber attnumOrig;
 
 	/*
 	 * Match status data.  curItem is the TID most recently tested (could be a
@@ -593,6 +598,9 @@ typedef struct RumScanKeyData
 	bool		recheckCurItem;
 	bool		isFinished;
 	bool		orderBy;
+
+	RumScanKey	*addInfoKeys;
+	int			addInfoNKeys;
 }	RumScanKeyData;
 
 typedef struct RumScanEntryData
@@ -605,6 +613,7 @@ typedef struct RumScanEntryData
 	StrategyNumber strategy;
 	int32		searchMode;
 	OffsetNumber attnum;
+	OffsetNumber attnumOrig;
 
 	/* Current page in posting tree */
 	Buffer		buffer;
@@ -613,6 +622,7 @@ typedef struct RumScanEntryData
 	RumKey		curRumKey;
 
 	/* for a partial-match or full-scan query, we accumulate all TIDs here */
+	bool		forceUseBitmap;
 	TIDBitmap  *matchBitmap;
 	TBMIterator *matchIterator;
 	TBMIterateResult *matchResult;
@@ -651,7 +661,7 @@ typedef struct RumScanOpaqueData
 	MemoryContext keyCtx;		/* used to hold key and entry data */
 	RumState	rumstate;
 
-	RumScanKey	keys;			/* one per scan qualifier expr */
+	RumScanKey	*keys;			/* one per scan qualifier expr */
 	uint32		nkeys;
 	int			norderbys;
 

rumbtree.c

@@ -99,7 +99,7 @@ rumReFindLeafPage(RumBtree btree, RumBtreeStack * stack)
 		 * that requested leaf page is in this subtree only when requested
 		 * item pointer is less than item pointer previous to rightmost.
 		 */
-		if (compareRumKey(btree->rumstate,
+		if (compareRumKey(btree->rumstate, btree->entryAttnum,
 			  &(((PostingItem *) RumDataPageGetItem(page, maxoff - 1))->key),
 								   &btree->items[btree->curitem]) >= 0)
 		{

rumbulk.c

@@ -260,10 +260,12 @@ qsortCompareItemPointers(const void *a, const void *b)
 	return res;
 }
 
+static AttrNumber AttrNumberQsort = 0;
+
 static int
 qsortCompareRumKey(const void *a, const void *b, void *arg)
 {
-	return compareRumKey(arg, a, b);
+	return compareRumKey(arg, AttrNumberQsort, a, b);
 }
 
 /* Prepare to read out the rbtree contents using rumGetBAEntry */
@@ -301,6 +303,8 @@ rumGetBAEntry(BuildAccumulator *accum,
 
 	if (entry->count > 1)
 	{
+		AttrNumberQsort = entry->attnum;
+
 		if (accum->rumstate->useAlternativeOrder &&
 			entry->attnum == accum->rumstate->attrnAddToColumn)
 			qsort_arg(list, entry->count, sizeof(RumKey),

rumdatapage.c

@@ -317,9 +317,10 @@ rumCompareItemPointers(const ItemPointerData *a, const ItemPointerData *b)
 }
 
 int
-compareRumKey(RumState * state, const RumKey * a, const RumKey * b)
+compareRumKey(RumState * state, const AttrNumber attno,
+			  const RumKey * a, const RumKey * b)
 {
-	if (state->useAlternativeOrder)
+	if (state->useAlternativeOrder && attno == state->attrnAddToColumn)
 	{
 		/* assume NULL is less than any real value */
 		if (a->addInfoIsNull == false && b->addInfoIsNull == false)
@@ -357,7 +358,7 @@ compareRumKey(RumState * state, const RumKey * a, const RumKey * b)
  * Caller is responsible that there is enough space at *dst.
  */
 uint32
-rumMergeItemPointers(RumState * rumstate, RumKey * dst,
+rumMergeItemPointers(RumState * rumstate, AttrNumber attno, RumKey * dst,
 					 RumKey * a, uint32 na, RumKey * b, uint32 nb)
 {
 	RumKey	   *dptr = dst;
@@ -368,7 +369,7 @@ rumMergeItemPointers(RumState * rumstate, RumKey * dst,
 	{
 		int			cmp;
 
-		cmp = compareRumKey(rumstate, aptr, bptr);
+		cmp = compareRumKey(rumstate, attno, aptr, bptr);
 
 		if (cmp > 0)
 		{
@@ -412,6 +413,7 @@ dataIsMoveRight(RumBtree btree, Page page)
 		return false;
 
 	res = compareRumKey(btree->rumstate,
+						btree->entryAttnum,
 						&btree->items[btree->curitem],
 						RumDataPageGetRightBound(page));
 
@@ -465,6 +467,7 @@ dataLocateItem(RumBtree btree, RumBtreeStack * stack)
 		else
 		{
 			result = compareRumKey(btree->rumstate,
+								   btree->entryAttnum,
 								   &btree->items[btree->curitem],
 								   &pitem->key);
 		}
@@ -545,7 +548,8 @@ findInLeafPage(RumBtree btree, Page page, OffsetNumber *offset,
 			RumKey	k;
 
 			convertIndexToKey(index, &k);
-			cmp = compareRumKey(btree->rumstate, &k,
+			cmp = compareRumKey(btree->rumstate,
+								btree->entryAttnum, &k,
 								&btree->items[btree->curitem]);
 
 		}
@@ -577,7 +581,7 @@ findInLeafPage(RumBtree btree, Page page, OffsetNumber *offset,
 		ptr = rumDataPageLeafRead(ptr, btree->entryAttnum, &item,
 								  btree->rumstate);
 
-		cmp = compareRumKey(btree->rumstate,
+		cmp = compareRumKey(btree->rumstate, btree->entryAttnum,
 							&btree->items[btree->curitem], &item);
 
 		if (cmp == 0)
@@ -888,8 +892,7 @@ dataPlaceToPage(RumBtree btree, Page page, OffsetNumber off)
 
 			ptr = rumPlaceToDataPageLeaf(ptr, btree->entryAttnum,
 								   &btree->items[j], &iptr, btree->rumstate);
-			freespace = RumDataPageFreeSpacePre(page, ptr);
-			Assert(freespace >= 0);
+			Assert(RumDataPageFreeSpacePre(page, ptr) >= 0);
 
 			iptr = btree->items[j].iptr;
 			btree->curitem++;
@@ -906,8 +909,7 @@ dataPlaceToPage(RumBtree btree, Page page, OffsetNumber off)
 				ptr = rumPlaceToDataPageLeaf(ptr, btree->entryAttnum, &copy_item,
 											 &iptr, btree->rumstate);
 
-				freespace = RumDataPageFreeSpacePre(page, ptr);
-				Assert(freespace >= 0);
+				Assert(RumDataPageFreeSpacePre(page, ptr) >= 0);
 
 				iptr = copy_item.iptr;
 			}
@@ -976,8 +978,6 @@ dataSplitPageLeaf(RumBtree btree, Buffer lbuf, Buffer rbuf,
 	RumKey		item;
 	int			totalCount = 0;
 	int			maxItemIndex = btree->curitem;
-	int			freespace;
-
 	static char lpageCopy[BLCKSZ];
 
 	dataPrepareData(btree, newlPage, off);
@@ -1084,8 +1084,7 @@ dataSplitPageLeaf(RumBtree btree, Buffer lbuf, Buffer rbuf,
 				ptr = rumPlaceToDataPageLeaf(ptr, btree->entryAttnum,
 											 &btree->items[btree->curitem],
 											 &prevIptr, btree->rumstate);
-				freespace = RumDataPageFreeSpacePre(page, ptr);
-				Assert(freespace >= 0);
+				Assert(RumDataPageFreeSpacePre(page, ptr) >= 0);
 
 				prevIptr = btree->items[btree->curitem].iptr;
 				btree->curitem++;
@@ -1100,8 +1099,7 @@ dataSplitPageLeaf(RumBtree btree, Buffer lbuf, Buffer rbuf,
 		curIptr = item;
 		ptr = rumPlaceToDataPageLeaf(ptr, btree->entryAttnum, &item,
 									 &prevIptr, btree->rumstate);
-		freespace = RumDataPageFreeSpacePre(page, ptr);
-		Assert(freespace >= 0);
+		Assert(RumDataPageFreeSpacePre(page, ptr) >= 0);
 
 		prevIptr = item.iptr;
 
@@ -1115,8 +1113,7 @@ dataSplitPageLeaf(RumBtree btree, Buffer lbuf, Buffer rbuf,
 			curIptr = btree->items[btree->curitem];
 			ptr = rumPlaceToDataPageLeaf(ptr, btree->entryAttnum,
 				  &btree->items[btree->curitem], &prevIptr, btree->rumstate);
-			freespace = RumDataPageFreeSpacePre(page, ptr);
-			Assert(freespace >= 0);
+			Assert(RumDataPageFreeSpacePre(page, ptr) >= 0);
 
 			prevIptr = btree->items[btree->curitem].iptr;
 			btree->curitem++;