store RumConfig in RumState

Author: feodor

rum.h

@@ -16,6 +16,7 @@
 #include "access/generic_xlog.h"
 #include "access/gin.h"
 #include "access/itup.h"
+#include "access/sdir.h"
 #include "lib/rbtree.h"
 #include "storage/bufmgr.h"
 
@@ -321,6 +322,17 @@ typedef struct RumOptions
 #define RUM_SHARE	BUFFER_LOCK_SHARE
 #define RUM_EXCLUSIVE  BUFFER_LOCK_EXCLUSIVE
 
+#define MAX_STRATEGIES	(8)
+typedef struct RumConfig
+{
+	Oid			addInfoTypeOid;
+
+	struct {
+		StrategyNumber	strategy;
+		ScanDirection	direction;
+	}		strategyInfo[MAX_STRATEGIES];
+}	RumConfig;
+
 /*
  * RumState: working data structure describing the index being worked on
  */
@@ -345,7 +357,7 @@ typedef struct RumState
 	 */
 	TupleDesc	origTupdesc;
 	TupleDesc	tupdesc[INDEX_MAX_KEYS];
-	Oid			addInfoTypeOid[INDEX_MAX_KEYS];
+	RumConfig	rumConfig[INDEX_MAX_KEYS];
 	Form_pg_attribute addAttrs[INDEX_MAX_KEYS];
 
 	/*
@@ -371,11 +383,6 @@ typedef struct RumState
 	Oid			supportCollation[INDEX_MAX_KEYS];
 }	RumState;
 
-typedef struct RumConfig
-{
-	Oid			addInfoTypeOid;
-}	RumConfig;
-
 /* XLog stuff */
 
 #define RUM_NDELETE_AT_ONCE 16
@@ -599,6 +606,7 @@ typedef struct RumScanKeyData
 	bool		recheckCurItem;
 	bool		isFinished;
 	bool		orderBy;
+	ScanDirection	scanDirection;
 
 	RumScanKey	*addInfoKeys;
 	int			addInfoNKeys;
@@ -638,6 +646,7 @@ typedef struct RumScanEntryData
 	uint32		nlist;
 	OffsetNumber offset;
 
+	ScanDirection	scanDirection;
 	bool		isFinished;
 	bool		reduceResult;
 	bool		preValue;

rumfast.c

@@ -656,7 +656,7 @@ processPendingPage(BuildAccumulator *accum, KeyArray *ka,
 		/* Check for change of heap TID or attnum */
 		curattnum = rumtuple_get_attrnum(accum->rumstate, itup);
 
-		if (OidIsValid(accum->rumstate->addInfoTypeOid[curattnum - 1]))
+		if (OidIsValid(accum->rumstate->rumConfig[curattnum - 1].addInfoTypeOid))
 		{
 			Form_pg_attribute attr = accum->rumstate->addAttrs[curattnum - 1];
 

rumget.c

@@ -2239,7 +2239,7 @@ collectMatchesForHeapRow(IndexScanDesc scan, pendingPosition *pos)
 						else
 						{
 							key->entryRes[j] = true;
-							if (OidIsValid(so->rumstate.addInfoTypeOid[i]))
+							if (OidIsValid(so->rumstate.rumConfig[i].addInfoTypeOid))
 								key->addInfo[j] = index_getattr(itup,
 												 so->rumstate.oneCol ? 2 : 3,
 										   so->rumstate.tupdesc[attrnum - 1],

rumscan.c

@@ -120,6 +120,7 @@ rumFillScanEntry(RumScanOpaque so, OffsetNumber attnum,
 	scanEntry->isFinished = false;
 	scanEntry->reduceResult = false;
 	scanEntry->useMarkAddInfo = false;
+	scanEntry->scanDirection = NoMovementScanDirection;
 	ItemPointerSetMin(&scanEntry->markAddInfo.iptr);
 
 	return scanEntry;
@@ -155,6 +156,7 @@ rumFillScanKey(RumScanOpaque so, OffsetNumber attnum,
 	key->searchMode = searchMode;
 	key->attnum = key->attnumOrig = attnum;
 	key->useAddToColumn = false;
+	key->scanDirection = NoMovementScanDirection;
 
 	RumItemSetMin(&key->curItem);
 	key->curItemMatches = false;

rumutil.c

@@ -176,46 +176,42 @@ initRumState(RumState * state, Relation index)
 
 	for (i = 0; i < origTupdesc->natts; i++)
 	{
-		RumConfig	rumConfig;
+		RumConfig	*rumConfig = state->rumConfig + i;
 
-		rumConfig.addInfoTypeOid = InvalidOid;
+		rumConfig->addInfoTypeOid = InvalidOid;
 
 		if (index_getprocid(index, i + 1, RUM_CONFIG_PROC) != InvalidOid)
 		{
 			fmgr_info_copy(&(state->configFn[i]),
 						   index_getprocinfo(index, i + 1, RUM_CONFIG_PROC),
 						   CurrentMemoryContext);
 
-			FunctionCall1(&state->configFn[i], PointerGetDatum(&rumConfig));
+			FunctionCall1(&state->configFn[i], PointerGetDatum(rumConfig));
 		}
 
 		if (state->attrnAddToColumn == i + 1)
 		{
-			if (OidIsValid(rumConfig.addInfoTypeOid))
+			if (OidIsValid(rumConfig->addInfoTypeOid))
 				elog(ERROR, "AddTo could should not have AddInfo");
 
-			state->addInfoTypeOid[i] = origTupdesc->attrs[
+			rumConfig->addInfoTypeOid = origTupdesc->attrs[
 									state->attrnOrderByColumn - 1]->atttypid;
 		}
-		else
-		{
-			state->addInfoTypeOid[i] = rumConfig.addInfoTypeOid;
-		}
 
 		if (state->oneCol)
 		{
 			state->tupdesc[i] = CreateTemplateTupleDesc(
-						OidIsValid(state->addInfoTypeOid[i]) ? 2 : 1, false);
+						OidIsValid(rumConfig->addInfoTypeOid) ? 2 : 1, false);
 			TupleDescInitEntry(state->tupdesc[i], (AttrNumber) 1, NULL,
 							   origTupdesc->attrs[i]->atttypid,
 							   origTupdesc->attrs[i]->atttypmod,
 							   origTupdesc->attrs[i]->attndims);
 			TupleDescInitEntryCollation(state->tupdesc[i], (AttrNumber) 1,
 										origTupdesc->attrs[i]->attcollation);
-			if (OidIsValid(state->addInfoTypeOid[i]))
+			if (OidIsValid(rumConfig->addInfoTypeOid))
 			{
 				TupleDescInitEntry(state->tupdesc[i], (AttrNumber) 2, NULL,
-								   state->addInfoTypeOid[i], -1, 0);
+								   rumConfig->addInfoTypeOid, -1, 0);
 				state->addAttrs[i] = state->tupdesc[i]->attrs[1];
 			}
 			else
@@ -226,7 +222,7 @@ initRumState(RumState * state, Relation index)
 		else
 		{
 			state->tupdesc[i] = CreateTemplateTupleDesc(
-						OidIsValid(state->addInfoTypeOid[i]) ? 3 : 2, false);
+						OidIsValid(rumConfig->addInfoTypeOid) ? 3 : 2, false);
 			TupleDescInitEntry(state->tupdesc[i], (AttrNumber) 1, NULL,
 							   INT2OID, -1, 0);
 			TupleDescInitEntry(state->tupdesc[i], (AttrNumber) 2, NULL,
@@ -235,10 +231,10 @@ initRumState(RumState * state, Relation index)
 							   origTupdesc->attrs[i]->attndims);
 			TupleDescInitEntryCollation(state->tupdesc[i], (AttrNumber) 2,
 										origTupdesc->attrs[i]->attcollation);
-			if (OidIsValid(state->addInfoTypeOid[i]))
+			if (OidIsValid(rumConfig->addInfoTypeOid))
 			{
 				TupleDescInitEntry(state->tupdesc[i], (AttrNumber) 3, NULL,
-								   state->addInfoTypeOid[i], -1, 0);
+								   rumConfig->addInfoTypeOid, -1, 0);
 				state->addAttrs[i] = state->tupdesc[i]->attrs[2];
 			}
 			else