Fix ordering function declaration

Author: za-arthur

src/btree_rum.c

@@ -332,25 +332,25 @@ PG_FUNCTION_INFO_V1(rum_##type##_key_distance);								\
 Datum																		\
 rum_##type##_key_distance(PG_FUNCTION_ARGS)									\
 {																			\
-	StrategyNumber	strategy = PG_GETARG_UINT16(3);							\
+	StrategyNumber	strategy = PG_GETARG_UINT16(2);							\
 	Datum			diff;													\
 																			\
 	switch (strategy)														\
 	{																		\
 		case RUM_DISTANCE:													\
 			diff = DirectFunctionCall2(rum_##type##_distance,				\
-									   PG_GETARG_DATUM(2),					\
-									   PG_GETARG_DATUM(4));					\
+									   PG_GETARG_DATUM(0),					\
+									   PG_GETARG_DATUM(1));					\
 			break;															\
 		case RUM_LEFT_DISTANCE:												\
 			diff = DirectFunctionCall2(rum_##type##_left_distance,			\
-									   PG_GETARG_DATUM(2),					\
-									   PG_GETARG_DATUM(4));					\
+									   PG_GETARG_DATUM(0),					\
+									   PG_GETARG_DATUM(1));					\
 			break;															\
 		case RUM_RIGHT_DISTANCE:											\
 			diff = DirectFunctionCall2(rum_##type##_right_distance,			\
-									   PG_GETARG_DATUM(2),					\
-									   PG_GETARG_DATUM(4));					\
+									   PG_GETARG_DATUM(0),					\
+									   PG_GETARG_DATUM(1));					\
 			break;															\
 		default:															\
 			elog(ERROR, "rum_%s_key_distance: unknown strategy %u",			\

src/rum_ts_utils.c

@@ -1411,20 +1411,18 @@ rum_tsquery_distance(PG_FUNCTION_ARGS)
 {
 	bool	   *check = (bool *) PG_GETARG_POINTER(0);
 
-	/* RumNullCategory keyCategory = PG_GETARG_CHAR(1); */
-	/* Datum		key = PG_GETARG_DATUM(2); */
-	TSQuery		query = PG_GETARG_TSQUERY(4);
-	int			nkeys = PG_GETARG_INT32(5);
-	Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(6);
-	Datum	   *addInfo = (Datum *) PG_GETARG_POINTER(10);
-	bool	   *addInfoIsNull = (bool *) PG_GETARG_POINTER(11);
+	TSQuery		query = PG_GETARG_TSQUERY(2);
+	int			nkeys = PG_GETARG_INT32(3);
+	Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(4);
+	Datum	   *addInfo = (Datum *) PG_GETARG_POINTER(8);
+	bool	   *addInfoIsNull = (bool *) PG_GETARG_POINTER(9);
 	float8		res;
 	int		   *map_item_operand = (int *) (extra_data[0]);
 
 	res = calc_score_addinfo(weights, check, query, map_item_operand,
 							 addInfo, addInfoIsNull, nkeys);
 
-	PG_FREE_IF_COPY(query, 4);
+	PG_FREE_IF_COPY(query, 2);
 	if (res == 0)
 		PG_RETURN_FLOAT8(get_float8_infinity());
 	else

src/rumget.c

@@ -2127,6 +2127,21 @@ keyGetOrdering(RumState * rumstate, MemoryContext tempCtx, RumScanKey key,
 											UInt16GetDatum(key->strategy)
 											));
 	}
+	else if (key->useCurKey)
+	{
+		Assert(key->nentries == 0);
+		Assert(key->nuserentries == 0);
+
+		if (key->curKeyCategory != RUM_CAT_NORM_KEY)
+			return get_float8_infinity();
+
+		return DatumGetFloat8(FunctionCall3(
+										&rumstate->orderingFn[key->attnum - 1],
+											key->curKey,
+											key->query,
+											UInt16GetDatum(key->strategy)
+											));
+	}
 
 	for (i = 0; i < key->nentries; i++)
 	{
@@ -2146,11 +2161,9 @@ keyGetOrdering(RumState * rumstate, MemoryContext tempCtx, RumScanKey key,
 		}
 	}
 
-	return DatumGetFloat8(FunctionCall12Coll(&rumstate->orderingFn[key->attnum - 1],
+	return DatumGetFloat8(FunctionCall10Coll(&rumstate->orderingFn[key->attnum - 1],
 								 rumstate->supportCollation[key->attnum - 1],
 											 PointerGetDatum(key->entryRes),
-											 DatumGetChar(key->curKeyCategory),
-											 key->curKey,
 											 UInt16GetDatum(key->strategy),
 											 key->query,
 										   UInt32GetDatum(key->nuserentries),

src/rumutil.c

@@ -957,50 +957,3 @@ FunctionCall10Coll(FmgrInfo *flinfo, Oid collation, Datum arg1, Datum arg2,
 
 	return result;
 }
-
-Datum
-FunctionCall12Coll(FmgrInfo *flinfo, Oid collation,
-				   Datum arg1, Datum arg2,
-				   Datum arg3, Datum arg4, Datum arg5,
-				   Datum arg6, Datum arg7, Datum arg8,
-				   Datum arg9, Datum arg10,
-				   Datum arg11, Datum arg12)
-{
-	FunctionCallInfoData fcinfo;
-	Datum		result;
-
-	InitFunctionCallInfoData(fcinfo, flinfo, 12, collation, NULL, NULL);
-
-	fcinfo.arg[0] = arg1;
-	fcinfo.arg[1] = arg2;
-	fcinfo.arg[2] = arg3;
-	fcinfo.arg[3] = arg4;
-	fcinfo.arg[4] = arg5;
-	fcinfo.arg[5] = arg6;
-	fcinfo.arg[6] = arg7;
-	fcinfo.arg[7] = arg8;
-	fcinfo.arg[8] = arg9;
-	fcinfo.arg[9] = arg10;
-	fcinfo.arg[10] = arg11;
-	fcinfo.arg[11] = arg12;
-	fcinfo.argnull[0] = false;
-	fcinfo.argnull[1] = false;
-	fcinfo.argnull[2] = false;
-	fcinfo.argnull[3] = false;
-	fcinfo.argnull[4] = false;
-	fcinfo.argnull[5] = false;
-	fcinfo.argnull[6] = false;
-	fcinfo.argnull[7] = false;
-	fcinfo.argnull[8] = false;
-	fcinfo.argnull[9] = false;
-	fcinfo.argnull[10] = false;
-	fcinfo.argnull[11] = false;
-
-	result = FunctionCallInvoke(&fcinfo);
-
-	/* Check for null result, since caller is clearly not expecting one */
-	if (fcinfo.isnull)
-		elog(ERROR, "function %u returned NULL", fcinfo.flinfo->fn_oid);
-
-	return result;
-}