remove triconsistent method. use pre_consistent instead

feodor · feodor · commit eba125c8d4c5 · 2016-05-15T20:14:07.000+03:00
diff --git a/rum--1.0.sql b/rum--1.0.sql
@@ -59,10 +59,9 @@ AS
         FUNCTION        3       rum_extract_tsquery(tsquery,internal,smallint,internal,internal,internal,internal),
         FUNCTION        4       rum_tsquery_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
         FUNCTION        5       gin_cmp_prefix(text,text,smallint,internal),
-        FUNCTION        6       gin_tsquery_triconsistent(internal,smallint,tsvector,int,internal,internal,internal),
-        FUNCTION        7       rum_tsvector_config(internal),
-        FUNCTION        8       rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
-        FUNCTION        9       rum_tsquery_distance(internal,smallint,tsvector,int,internal,internal,internal,internal,internal),
+        FUNCTION        6       rum_tsvector_config(internal),
+        FUNCTION        7       rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
+        FUNCTION        8       rum_tsquery_distance(internal,smallint,tsvector,int,internal,internal,internal,internal,internal),
         STORAGE         text;
 
 -- timestamp ops
@@ -146,7 +145,7 @@ AS
 	FUNCTION        4 rum_timestamp_consistent(internal,smallint,timestamp,int,internal,internal,internal,internal),
 	FUNCTION        5 rum_timestamp_compare_prefix(timestamp,timestamp,smallint,internal),
 	-- support to timestamp disttance in rum_tsvector_timestamp_ops
-	FUNCTION		10 rum_timestamp_outer_distance(timestamp, timestamp, smallint),
+	FUNCTION		9 rum_timestamp_outer_distance(timestamp, timestamp, smallint),
 	OPERATOR		20		<-> (timestamp,timestamp) FOR ORDER BY pg_catalog.float_ops,
 	OPERATOR		21		<-| (timestamp,timestamp) FOR ORDER BY pg_catalog.float_ops,
 	OPERATOR		22		|-> (timestamp,timestamp) FOR ORDER BY pg_catalog.float_ops,
@@ -169,8 +168,7 @@ AS
         FUNCTION        3       rum_extract_tsquery(tsquery,internal,smallint,internal,internal,internal,internal),
         FUNCTION        4       rum_tsquery_timestamp_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
         FUNCTION        5       gin_cmp_prefix(text,text,smallint,internal),
-        FUNCTION        6       gin_tsquery_triconsistent(internal,smallint,tsvector,int,internal,internal,internal),
-        FUNCTION        8       rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
+        FUNCTION        7       rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
         STORAGE         text;
 
 
diff --git a/rum.h b/rum.h
@@ -742,11 +742,11 @@ extern void rumInsertCleanup(RumState *rumstate,
 				 bool vac_delay, IndexBulkDeleteResult *stats);
 
 /* rum_ts_utils.c */
-#define RUM_CONFIG_PROC				7
-#define RUM_PRE_CONSISTENT_PROC		8
-#define RUM_ORDERING_PROC			9
-#define RUM_OUTER_ORDERING_PROC		10
-#define RUMNProcs					10
+#define RUM_CONFIG_PROC				6
+#define RUM_PRE_CONSISTENT_PROC		7
+#define RUM_ORDERING_PROC			8
+#define RUM_OUTER_ORDERING_PROC		9
+#define RUMNProcs					9
 
 extern Datum rum_extract_tsvector(PG_FUNCTION_ARGS);
 extern Datum rum_extract_tsquery(PG_FUNCTION_ARGS);
diff --git a/rumvalidate.c b/rumvalidate.c
@@ -135,13 +135,6 @@ rumvalidate(Oid opclassoid)
 											4, 4, opckeytype, opckeytype,
 											INT2OID, INTERNALOID);
 				break;
-			case GIN_TRICONSISTENT_PROC:
-				ok = check_amproc_signature(procform->amproc, CHAROID, false,
-											7, 7, INTERNALOID, INT2OID,
-											opcintype, INT4OID,
-											INTERNALOID, INTERNALOID,
-											INTERNALOID);
-				break;
 			case RUM_CONFIG_PROC:
 				ok = check_amproc_signature(procform->amproc, VOIDOID, false,
 											1, 1, INTERNALOID);
@@ -263,8 +256,8 @@ rumvalidate(Oid opclassoid)
 			continue;			/* got it */
 		if (i == GIN_COMPARE_PARTIAL_PROC)
 			continue;			/* optional method */
-		if (i == GIN_CONSISTENT_PROC || i == GIN_TRICONSISTENT_PROC)
-			continue;			/* don't need both, see check below loop */
+		if (i == GIN_CONSISTENT_PROC)
+			continue;
 		if (i == RUM_PRE_CONSISTENT_PROC)
 			continue;
 		ereport(INFO,
@@ -274,18 +267,15 @@ rumvalidate(Oid opclassoid)
 		result = false;
 	}
 	if (!opclassgroup ||
-		((opclassgroup->functionset & (1 << GIN_CONSISTENT_PROC)) == 0 &&
-		 (opclassgroup->functionset & (1 << GIN_TRICONSISTENT_PROC)) == 0))
+		(opclassgroup->functionset & (1 << GIN_CONSISTENT_PROC)) == 0) 
 	{
 		ereport(INFO,
 				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-				 errmsg("rum opclass %s is missing support function %d or %d",
-						opclassname,
-						GIN_CONSISTENT_PROC, GIN_TRICONSISTENT_PROC)));
+				 errmsg("rum opclass %s is missing support function %d",
+						opclassname, GIN_CONSISTENT_PROC)));
 		result = false;
 	}
 
-
 	ReleaseCatCacheList(proclist);
 	ReleaseCatCacheList(oprlist);
 	ReleaseSysCache(familytup);
