revert b2ef47c8eb72dd44048ca363a91a4488bea65859 to have natural oredering

feodor · feodor · commit 096fa863de1b · 2016-07-13T18:24:39.000+03:00
diff --git a/rum--1.0.sql b/rum--1.0.sql
@@ -104,11 +104,6 @@ CREATE OPERATOR |=> (
 
 -- timestamp operator class
 
-CREATE FUNCTION rum_timestamp_cmp(timestamp,timestamp)
-RETURNS int
-AS 'MODULE_PATHNAME'
-LANGUAGE C STRICT IMMUTABLE;
-
 CREATE FUNCTION rum_timestamp_extract_value(timestamp,internal,internal,internal,internal)
 RETURNS internal
 AS 'MODULE_PATHNAME'
@@ -148,7 +143,7 @@ AS
 	OPERATOR        4       >=,
 	OPERATOR        5       >,
 	--support
-	FUNCTION        1 rum_timestamp_cmp(timestamp,timestamp),
+	FUNCTION        1 timestamp_cmp(timestamp,timestamp),
 	FUNCTION        2 rum_timestamp_extract_value(timestamp,internal,internal,internal,internal),
 	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),
diff --git a/rum_timestamp.c b/rum_timestamp.c
@@ -55,16 +55,14 @@ rum_timestamp_extract_query(PG_FUNCTION_ARGS)
 
 	switch (strategy)
 	{
-		case BTGreaterEqualStrategyNumber:
-		case BTGreaterStrategyNumber:
-			entries[0] = TimestampGetDatum(DT_NOEND); /* leftmost */
-			*ptr_partialmatch = true;
-			break;
-
 		case BTLessStrategyNumber:
 		case BTLessEqualStrategyNumber:
+			entries[0] = TimestampGetDatum(DT_NOBEGIN); /* leftmost */
+			*ptr_partialmatch = true;
+			break;
+		case BTGreaterEqualStrategyNumber:
+		case BTGreaterStrategyNumber:
 			*ptr_partialmatch = true;
-
 		case BTEqualStrategyNumber:
 		case RUM_TMST_DISTANCE:
 		case RUM_TMST_LEFT_DISTANCE:
@@ -78,20 +76,6 @@ rum_timestamp_extract_query(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(entries);
 }
 
-PG_FUNCTION_INFO_V1(rum_timestamp_cmp);
-Datum
-rum_timestamp_cmp(PG_FUNCTION_ARGS)
-{
-	Datum		a = PG_GETARG_DATUM(0);
-	Datum		b = PG_GETARG_DATUM(1);
-	int32		cmp;
-
-	cmp = -DatumGetInt32(DirectFunctionCall2Coll(timestamp_cmp,
-												PG_GET_COLLATION(),
-												a, b));
-	PG_RETURN_INT32(cmp);
-}
-
 PG_FUNCTION_INFO_V1(rum_timestamp_compare_prefix);
 Datum
 rum_timestamp_compare_prefix(PG_FUNCTION_ARGS)
@@ -102,22 +86,22 @@ rum_timestamp_compare_prefix(PG_FUNCTION_ARGS)
 	int32		res,
 				cmp;
 
-	cmp = DatumGetInt32(DirectFunctionCall2Coll(rum_timestamp_cmp,
+	cmp = DatumGetInt32(DirectFunctionCall2Coll(timestamp_cmp,
 												PG_GET_COLLATION(),
-								   (data->strategy == BTGreaterStrategyNumber ||
-								 data->strategy == BTGreaterEqualStrategyNumber)
+								   (data->strategy == BTLessStrategyNumber ||
+								 data->strategy == BTLessEqualStrategyNumber)
 												? data->datum : a, b));
 
 	switch (data->strategy)
 	{
-		case BTGreaterStrategyNumber:
+		case BTLessStrategyNumber:
 			/* If original datum > indexed one then return match */
 			if (cmp > 0)
 				res = 0;
 			else
 				res = 1;
 			break;
-		case BTGreaterEqualStrategyNumber:
+		case BTLessEqualStrategyNumber:
 			/* The same except equality */
 			if (cmp >= 0)
 				res = 0;
@@ -130,14 +114,14 @@ rum_timestamp_compare_prefix(PG_FUNCTION_ARGS)
 			else
 				res = 0;
 			break;
-		case BTLessEqualStrategyNumber:
+		case BTGreaterEqualStrategyNumber:
 			/* If original datum <= indexed one then return match */
 			if (cmp <= 0)
 				res = 0;
 			else
 				res = 1;
 			break;
-		case BTLessStrategyNumber:
+		case BTGreaterStrategyNumber:
 			/* If original datum <= indexed one then return match */
 			/* If original datum == indexed one then continue scan */
 			if (cmp < 0)
@@ -281,10 +265,10 @@ rum_timestamp_config(PG_FUNCTION_ARGS)
 	config->addInfoTypeOid = InvalidOid;
 
 	config->strategyInfo[0].strategy = RUM_TMST_LEFT_DISTANCE;
-	config->strategyInfo[0].direction = ForwardScanDirection;
+	config->strategyInfo[0].direction = BackwardScanDirection;
 
 	config->strategyInfo[1].strategy = RUM_TMST_RIGHT_DISTANCE;
-	config->strategyInfo[1].direction = BackwardScanDirection;
+	config->strategyInfo[1].direction = ForwardScanDirection;
 
 	config->strategyInfo[2].strategy = InvalidStrategy;
 
