remove fastupdate remains and rename orderByColuns to AttacnColumn for clarity

Author: feodor

src/rum.h

@@ -315,18 +315,12 @@ typedef struct
 typedef struct RumOptions
 {
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	bool		useFastUpdate;	/* use fast updates? */
 	bool		useAlternativeOrder;
-	int			orderByColumn;
+	int			attachColumn;
 	int			addToColumn;
 }	RumOptions;
 
 #define ALT_ADD_INFO_NULL_FLAG		(0x8000)
-#define RUM_DEFAULT_USE_FASTUPDATE	false
-#define RumGetUseFastUpdate(relation) \
-	((relation)->rd_options ? \
-	 ((RumOptions *) (relation)->rd_options)->useFastUpdate : RUM_DEFAULT_USE_FASTUPDATE)
-
 
 /* Macros for buffer lock/unlock operations */
 #define RUM_UNLOCK	BUFFER_LOCK_UNLOCK
@@ -353,7 +347,7 @@ typedef struct RumState
 	bool		isBuild;
 	bool		oneCol;			/* true if single-column index */
 	bool		useAlternativeOrder;
-	AttrNumber	attrnOrderByColumn;
+	AttrNumber	attrnAttachColumn;
 	AttrNumber	attrnAddToColumn;
 
 	/*

src/rumdatapage.c

@@ -333,7 +333,7 @@ compareRumKey(RumState * state, const AttrNumber attno,
 		if (a->addInfoIsNull == false && b->addInfoIsNull == false)
 		{
 			int			res;
-			AttrNumber	attnum = state->attrnOrderByColumn;
+			AttrNumber	attnum = state->attrnAttachColumn;
 
 			res = DatumGetInt32(FunctionCall2Coll(
 												  &state->compareFn[attnum - 1],

src/rumget.c

@@ -262,7 +262,7 @@ collectMatchBitmap(RumBtreeData * btree, RumBtreeStack * stack,
 	if (rumstate->useAlternativeOrder &&
 		scanEntry->attnumOrig == rumstate->attrnAddToColumn)
 	{
-		cmp = &rumstate->compareFn[rumstate->attrnOrderByColumn - 1];
+		cmp = &rumstate->compareFn[rumstate->attrnAttachColumn - 1];
 	}
 
 	/* Initialize  */
@@ -2090,7 +2090,7 @@ keyGetOrdering(RumState * rumstate, MemoryContext tempCtx, RumScanKey key,
 			return get_float8_infinity();
 
 		return DatumGetFloat8(FunctionCall3(
-				&rumstate->outerOrderingFn[rumstate->attrnOrderByColumn - 1],
+				&rumstate->outerOrderingFn[rumstate->attrnAttachColumn - 1],
 											key->outerAddInfo,
 											key->queryValues[0],
 											UInt16GetDatum(key->strategy)

src/ruminsert.c

@@ -538,10 +538,10 @@ rumBuildCallback(Relation index, HeapTuple htup, Datum *values,
 	Datum		outerAddInfo = (Datum) 0;
 	bool		outerAddInfoIsNull = true;
 
-	if (AttributeNumberIsValid(buildstate->rumstate.attrnOrderByColumn))
+	if (AttributeNumberIsValid(buildstate->rumstate.attrnAttachColumn))
 	{
-		outerAddInfo = values[buildstate->rumstate.attrnOrderByColumn - 1];
-		outerAddInfoIsNull = isnull[buildstate->rumstate.attrnOrderByColumn - 1];
+		outerAddInfo = values[buildstate->rumstate.attrnAttachColumn - 1];
+		outerAddInfoIsNull = isnull[buildstate->rumstate.attrnAttachColumn - 1];
 	}
 
 	oldCtx = MemoryContextSwitchTo(buildstate->tmpCtx);
@@ -810,10 +810,10 @@ ruminsert(Relation index, Datum *values, bool *isnull,
 
 	initRumState(&rumstate, index);
 
-	if (AttributeNumberIsValid(rumstate.attrnOrderByColumn))
+	if (AttributeNumberIsValid(rumstate.attrnAttachColumn))
 	{
-		outerAddInfo = values[rumstate.attrnOrderByColumn - 1];
-		outerAddInfoIsNull = isnull[rumstate.attrnOrderByColumn - 1];
+		outerAddInfo = values[rumstate.attrnAttachColumn - 1];
+		outerAddInfoIsNull = isnull[rumstate.attrnAttachColumn - 1];
 	}
 
 	for (i = 0; i < rumstate.origTupdesc->natts; i++)

src/rumscan.c

@@ -164,13 +164,13 @@ rumFillScanKey(RumScanOpaque so, OffsetNumber attnum,
 	key->addInfoKeys = NULL;
 	key->addInfoNKeys = 0;
 
-	if (key->orderBy && key->attnum == rumstate->attrnOrderByColumn)
+	if (key->orderBy && key->attnum == rumstate->attrnAttachColumn)
 	{
 		if (nQueryValues != 1)
 			elog(ERROR, "extractQuery should return only one value for ordering");
 		if (rumstate->canOuterOrdering[attnum - 1] == false)
 			elog(ERROR, "doesn't support ordering as additional info");
-		if (rumstate->origTupdesc->attrs[rumstate->attrnOrderByColumn - 1]->attbyval == false)
+		if (rumstate->origTupdesc->attrs[rumstate->attrnAttachColumn - 1]->attbyval == false)
 			elog(ERROR, "doesn't support order by over pass-by-reference column");
 
 		key->useAddToColumn = true;
@@ -592,7 +592,7 @@ rumNewScanKey(IndexScanDesc scan)
 		{
 			if (key->attnumOrig == so->rumstate.attrnAddToColumn)
 				hasAddOnFilter |= haofHasAddToRestriction;
-			if (key->attnumOrig == so->rumstate.attrnOrderByColumn)
+			if (key->attnumOrig == so->rumstate.attrnAttachColumn)
 				 hasAddOnFilter |= haofHasAddOnRestriction;
 		}
 
@@ -612,7 +612,7 @@ rumNewScanKey(IndexScanDesc scan)
 			RumScanKey  key = so->keys[i];
 
 			if (key->orderBy == false &&
-				key->attnumOrig == so->rumstate.attrnOrderByColumn)
+				key->attnumOrig == so->rumstate.attrnAttachColumn)
 			{
 				for(j=0; addToKey == NULL && j<so->nkeys; j++)
 					if (so->keys[j]->orderBy == false &&

src/rumutil.c

@@ -124,25 +124,25 @@ initRumState(RumState * state, Relation index)
 	state->oneCol = (origTupdesc->natts == 1) ? true : false;
 	state->origTupdesc = origTupdesc;
 
-	state->attrnOrderByColumn = InvalidAttrNumber;
+	state->attrnAttachColumn = InvalidAttrNumber;
 	state->attrnAddToColumn = InvalidAttrNumber;
 	if (index->rd_options)
 	{
 		RumOptions *options = (RumOptions *) index->rd_options;
 
-		if (options->orderByColumn > 0)
+		if (options->attachColumn > 0)
 		{
-			char	   *colname = (char *) options + options->orderByColumn;
+			char	   *colname = (char *) options + options->attachColumn;
 			AttrNumber	attrnOrderByHeapColumn;
 
 			attrnOrderByHeapColumn = get_attnum(index->rd_index->indrelid, colname);
 
 			if (!AttributeNumberIsValid(attrnOrderByHeapColumn))
 				elog(ERROR, "attribute \"%s\" is not found in table", colname);
 
-			state->attrnOrderByColumn = get_attnum(index->rd_id, colname);
+			state->attrnAttachColumn = get_attnum(index->rd_id, colname);
 
-			if (!AttributeNumberIsValid(state->attrnOrderByColumn))
+			if (!AttributeNumberIsValid(state->attrnAttachColumn))
 				elog(ERROR, "attribute \"%s\" is not found in index", colname);
 		}
 
@@ -162,13 +162,13 @@ initRumState(RumState * state, Relation index)
 				elog(ERROR, "attribute \"%s\" is not found in index", colname);
 		}
 
-		if (!(AttributeNumberIsValid(state->attrnOrderByColumn) &&
+		if (!(AttributeNumberIsValid(state->attrnAttachColumn) &&
 			  AttributeNumberIsValid(state->attrnAddToColumn)))
 			elog(ERROR, "AddTo and OrderBy columns should be defined both");
 
 		if (options->useAlternativeOrder)
 		{
-			if (!(AttributeNumberIsValid(state->attrnOrderByColumn) &&
+			if (!(AttributeNumberIsValid(state->attrnAttachColumn) &&
 				  AttributeNumberIsValid(state->attrnAddToColumn)))
 				elog(ERROR, "to use alternative ordering AddTo and OrderBy should be defined");
 
@@ -197,7 +197,7 @@ initRumState(RumState * state, Relation index)
 				elog(ERROR, "AddTo could should not have AddInfo");
 
 			rumConfig->addInfoTypeOid = origTupdesc->attrs[
-									state->attrnOrderByColumn - 1]->atttypid;
+									state->attrnAttachColumn - 1]->atttypid;
 		}
 
 		if (state->oneCol)
@@ -797,8 +797,7 @@ rumoptions(Datum reloptions, bool validate)
 	RumOptions *rdopts;
 	int			numoptions;
 	static const relopt_parse_elt tab[] = {
-		{"fastupdate", RELOPT_TYPE_BOOL, offsetof(RumOptions, useFastUpdate)},
-		{"attach", RELOPT_TYPE_STRING, offsetof(RumOptions, orderByColumn)},
+		{"attach", RELOPT_TYPE_STRING, offsetof(RumOptions, attachColumn)},
 		{"to", RELOPT_TYPE_STRING, offsetof(RumOptions, addToColumn)},
 		{"order_by_attach", RELOPT_TYPE_BOOL, offsetof(RumOptions, useAlternativeOrder)}
 	};