add to RumConfig knowledge about scan direction depending on strategy

Author: feodor

expected/rum.out

@@ -87,7 +87,7 @@ SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english',
 													'def <2> fgr');
  count 
 -------
-     2
+     1
 (1 row)
 
 SELECT rum_ts_distance(a, to_tsquery('pg_catalog.english', 'way')), *

rum--1.0.sql

@@ -119,6 +119,11 @@ RETURNS int4
 AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT IMMUTABLE;
 
+CREATE FUNCTION rum_timestamp_config(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT;
+
 CREATE FUNCTION rum_timestamp_extract_query(timestamp,internal,smallint,internal,internal,internal,internal)
 RETURNS internal
 AS 'MODULE_PATHNAME'
@@ -148,6 +153,7 @@ AS
 	FUNCTION        3 rum_timestamp_extract_query(timestamp,internal,smallint,internal,internal,internal,internal),
 	FUNCTION        4 rum_timestamp_consistent(internal,smallint,timestamp,int,internal,internal,internal,internal),
 	FUNCTION        5 rum_timestamp_compare_prefix(timestamp,timestamp,smallint,internal),
+    FUNCTION        6 rum_timestamp_config(internal),
 	-- support to timestamp disttance in rum_tsvector_timestamp_ops
 	FUNCTION		9 rum_timestamp_outer_distance(timestamp, timestamp, smallint),
 	OPERATOR		20		<=> (timestamp,timestamp) FOR ORDER BY pg_catalog.float_ops,

rum.h

@@ -985,6 +985,4 @@ extern Datum FunctionCall10Coll(FmgrInfo *flinfo, Oid collation,
 				   Datum arg6, Datum arg7, Datum arg8,
 				   Datum arg9, Datum arg10);
 
-#define FROM_STRATEGY		(21)
-
 #endif   /* __RUM_H__ */

rum_timestamp.c

@@ -3,6 +3,7 @@
 #include <limits.h>
 
 #include "access/stratnum.h"
+#include "rum.h"
 #include "utils/builtins.h"
 #include "utils/timestamp.h"
 
@@ -270,3 +271,20 @@ rum_timestamp_outer_distance(PG_FUNCTION_ARGS)
 
 	PG_RETURN_DATUM(diff);
 }
+
+PG_FUNCTION_INFO_V1(rum_timestamp_config);
+Datum
+rum_timestamp_config(PG_FUNCTION_ARGS)
+{
+	RumConfig  *config = (RumConfig *) PG_GETARG_POINTER(0);
+
+	config->addInfoTypeOid = InvalidOid;
+
+	config->strategyInfo[0].strategy = RUM_TMST_LEFT_DISTANCE;
+	config->strategyInfo[0].direction = ForwardScanDirection;
+
+	config->strategyInfo[1].strategy = InvalidStrategy;
+
+	PG_RETURN_VOID();
+}
+

rum_ts_utils.c

@@ -1202,5 +1202,7 @@ rum_tsvector_config(PG_FUNCTION_ARGS)
 	RumConfig  *config = (RumConfig *) PG_GETARG_POINTER(0);
 
 	config->addInfoTypeOid = BYTEAOID;
+	config->strategyInfo[0].strategy = InvalidStrategy;
+
 	PG_RETURN_VOID();
 }

rumscan.c

@@ -391,6 +391,23 @@ initScanKey(RumScanOpaque so, ScanKey skey, bool *hasNullQuery)
 				   (skey->sk_flags & SK_ORDER_BY) ? true : false);
 }
 
+static ScanDirection
+lookupScanDirection(RumState *state, AttrNumber attno, StrategyNumber strategy)
+{
+	int			i;
+	RumConfig	*rumConfig = state->rumConfig + attno - 1;
+
+	for(i = 0; rumConfig->strategyInfo[i].strategy != InvalidStrategy &&
+			   i < MAX_STRATEGIES; i++)
+	{
+		if (rumConfig->strategyInfo[i].strategy == strategy)
+			return rumConfig->strategyInfo[i].direction;
+
+	}
+
+	return NoMovementScanDirection;
+}
+
 static void
 fillMarkAddInfo(RumScanOpaque so, RumScanKey orderKey)
 {
@@ -405,7 +422,8 @@ fillMarkAddInfo(RumScanOpaque so, RumScanKey orderKey)
 
 		if (scanKey->attnum == so->rumstate.attrnAddToColumn &&
 			orderKey->attnum == so->rumstate.attrnAddToColumn &&
-			orderKey->strategy == FROM_STRATEGY /* FIXME teodor */)
+			lookupScanDirection(&so->rumstate, orderKey->attnumOrig,
+								orderKey->strategy) == ForwardScanDirection)
 		{
 			int j;
 

rumtsquery.c

@@ -629,5 +629,7 @@ ruminv_tsquery_config(PG_FUNCTION_ARGS)
 	RumConfig  *config = (RumConfig *) PG_GETARG_POINTER(0);
 
 	config->addInfoTypeOid = BYTEAOID;
+	config->strategyInfo[0].strategy = InvalidStrategy;
+
 	PG_RETURN_VOID();
 }