Additional comments to RumScanKey and RumScanEntry

Author: Arthur Zakirov

src/rum.h

@@ -584,8 +584,10 @@ typedef struct RumScanKeyData
 
 	/* array of check flags, reported to consistentFn */
 	bool	   *entryRes;
+	/* array of additional information, used in consistentFn and orderingFn */
 	Datum	   *addInfo;
 	bool	   *addInfoIsNull;
+	/* additional information, used in outerOrderingFn */
 	bool		useAddToColumn;
 	Datum		outerAddInfo;
 	bool		outerAddInfoIsNull;
@@ -616,7 +618,8 @@ typedef struct RumScanKeyData
 	bool		willSort; /* just a copy of RumScanOpaqueData.willSort */
 	ScanDirection	scanDirection;
 
-	RumScanKey	*addInfoKeys;
+	/* array of keys, used to scan using additional information as keys */
+	RumScanKey *addInfoKeys;
 	int			addInfoNKeys;
 }	RumScanKeyData;
 
@@ -638,9 +641,10 @@ typedef struct RumScanEntryData
 	/* current ItemPointer to heap */
 	RumItem		curItem;
 
-	/* for a partial-match or full-scan query, we accumulate all TIDs here */
-	bool		forceUseBitmap;
-	/* or here if we need to store addinfo */
+	/*
+	 * For a partial-match or full-scan query, we accumulate all TIDs and
+	 * and additional information here
+	 */
 	Tuplesortstate *matchSortstate;
 	RumItem		collectRumItem;
 
@@ -650,17 +654,20 @@ typedef struct RumScanEntryData
 
 	/* used for Posting list and one page in Posting tree */
 	RumItem	   *list;
-	MemoryContext context;
 	int16		nlist;
 	int16		offset;
 
-	ScanDirection	scanDirection;
+	ScanDirection scanDirection;
 	bool		isFinished;
 	bool		reduceResult;
-	bool		preValue;
 	uint32		predictNumberResult;
+
+	/* used to scan posting tree */
 	RumPostingTreeScan *gdi;
 
+	/* used in fast scan in addition to preConsistentFn */
+	bool		preValue;
+
 	/* Find by AddInfo */
 	bool		useMarkAddInfo;
 	RumItem		markAddInfo;

src/rumget.c

@@ -433,8 +433,6 @@ collectMatchBitmap(RumBtreeData * btree, RumBtreeStack * stack,
 			scanEntry->predictNumberResult += RumGetNPosting(itup);
 		}
 
-		if (scanEntry->forceUseBitmap)
-			return true;
 		/*
 		 * Done with this entry, go to the next
 		 */
@@ -529,7 +527,7 @@ startScanEntry(RumState * rumstate, RumScanEntry entry)
 
 	entry->isFinished = TRUE;
 
-	if (entry->isPartialMatch || entry->forceUseBitmap ||
+	if (entry->isPartialMatch ||
 		(entry->queryCategory == RUM_CAT_EMPTY_QUERY &&
 		 !entry->scanWithAddInfo))
 	{
@@ -599,11 +597,6 @@ startScanEntry(RumState * rumstate, RumScanEntry entry)
 													&entry->markAddInfo : NULL);
 
 			entry->gdi = gdi;
-			entry->context = AllocSetContextCreate(CurrentMemoryContext,
-												   "RUM entry temporary context",
-												   ALLOCSET_DEFAULT_MINSIZE,
-												   ALLOCSET_DEFAULT_INITSIZE,
-												   ALLOCSET_DEFAULT_MAXSIZE);
 
 			/*
 			 * We keep buffer pinned because we need to prevent deletion of
@@ -779,7 +772,7 @@ startScan(IndexScanDesc scan)
 		{
 			RumScanEntry entry = so->entries[i];
 
-			if (entry->isPartialMatch || entry->forceUseBitmap)
+			if (entry->isPartialMatch)
 			{
 				scanType = RumRegularScan;
 				break;
@@ -1011,11 +1004,6 @@ entryGetNextItemList(RumState * rumstate, RumScanEntry entry)
 
 		entry->buffer = rumScanBeginPostingTree(gdi, NULL);
 		entry->gdi = gdi;
-		entry->context = AllocSetContextCreate(CurrentMemoryContext,
-											   "RUM entry temporary context",
-											   ALLOCSET_DEFAULT_MINSIZE,
-											   ALLOCSET_DEFAULT_INITSIZE,
-											   ALLOCSET_DEFAULT_MAXSIZE);
 
 		/*
 		 * We keep buffer pinned because we need to prevent deletion of
@@ -1266,8 +1254,7 @@ compareCurRumItemScanDirection(RumState *rumstate, RumScanEntry entry,
 							   RumItem *minItem)
 {
 	return compareRumItemScanDirection(rumstate,
-						(entry->forceUseBitmap) ?
-							InvalidAttrNumber : entry->attnumOrig,
+						entry->attnumOrig,
 						entry->scanDirection,
 						&entry->curItem, minItem);
 }
@@ -1633,8 +1620,6 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumItem * item)
 		return;
 	}
 
-	Assert(!entry->forceUseBitmap);
-
 	/* Try to find in loaded part of page */
 	if ((ScanDirectionIsForward(entry->scanDirection) &&
 		 compareRumItem(rumstate, entry->attnumOrig,

src/rumscan.c

@@ -105,7 +105,6 @@ rumFillScanEntry(RumScanOpaque so, OffsetNumber attnum,
 	scanEntry->strategy = strategy;
 	scanEntry->searchMode = searchMode;
 	scanEntry->attnum = scanEntry->attnumOrig = attnum;
-	scanEntry->forceUseBitmap = false;
 
 	scanEntry->buffer = InvalidBuffer;
 	RumItemSetMin(&scanEntry->curItem);