Add support for 9.6

Author: ildus

README.md

@@ -1,7 +1,7 @@
 tsvector2
 ==========
 
-Extended `tsvector` type for PostgreSQL 10+. It was implemented to provide better
+Extended `tsvector` type for PostgreSQL 9.6+. It was implemented to provide better
 compression and to remove 1MB size limitation of original tsvector type.
 
 It could be used as transparent replacement of original tsvector and supports
@@ -38,3 +38,9 @@ Common functions that could be safely used on both types
 * `ts_rank_cd`
 * `ts_delete`
 * `ts_filter`
+
+Installation
+-------------
+
+	make install PG_CONFIG=<path_to_pg_config>
+	psql <database> -c "create extension tsvector2"

init.sql

@@ -23,11 +23,6 @@ CREATE FUNCTION tsvector2send(tsvector2)
 	AS 'MODULE_PATHNAME'
 	LANGUAGE C STRICT IMMUTABLE;
 
-CREATE FUNCTION tsvector2_concat(tsvector2, tsvector2)
-	RETURNS tsvector2
-	AS 'MODULE_PATHNAME'
-	LANGUAGE C STRICT IMMUTABLE;
-
 CREATE TYPE tsvector2 (
 	INPUT = tsvector2in,
 	OUTPUT = tsvector2out,
@@ -38,6 +33,11 @@ CREATE TYPE tsvector2 (
 );
 
 -- functions
+CREATE FUNCTION tsvector2_concat(tsvector2, tsvector2)
+	RETURNS tsvector2
+	AS 'MODULE_PATHNAME'
+	LANGUAGE C STRICT IMMUTABLE;
+
 CREATE FUNCTION tsvector2_lt(tsvector2, tsvector2)
 	RETURNS bool
 	AS 'MODULE_PATHNAME'
@@ -385,7 +385,7 @@ CREATE OPERATOR CLASS gin_tsvector2_ops DEFAULT
 	FUNCTION 3  gin_extract_tsquery(tsquery,internal,int2,internal,internal,internal,internal),
 	FUNCTION 4  gin_tsquery_consistent(internal,int2,tsquery,int4,internal,internal,internal,internal),
 	FUNCTION 5  gin_cmp_prefix(text,text,int2,internal),
-	FUNCTION 6  gin_tsquery_triconsistent;
+	FUNCTION 6  gin_tsquery_triconsistent(internal,int2,tsvector,int4,internal,internal,internal);
 
 -- gist support
 CREATE FUNCTION gist_tsvector2_compress(internal,tsquery,int2,oid,internal)
@@ -398,9 +398,9 @@ CREATE OPERATOR CLASS gist_tsvector2_ops DEFAULT
 	FOR TYPE tsvector2 USING gist FAMILY tsvector2_ops AS
 	OPERATOR 1  @@ (tsvector2, tsquery),
 	FUNCTION 1  gtsvector_consistent(internal,tsvector,int2,oid,internal),
-	FUNCTION 2  gtsvector_union,
-	FUNCTION 3  gist_tsvector2_compress,
-	FUNCTION 4  gtsvector_decompress,
-	FUNCTION 5  gtsvector_penalty,
-	FUNCTION 6  gtsvector_picksplit,
-	FUNCTION 7  gtsvector_same;
+	FUNCTION 2  gtsvector_union(internal,internal),
+	FUNCTION 3  gist_tsvector2_compress(internal,tsquery,int2,oid,internal),
+	FUNCTION 4  gtsvector_decompress(internal),
+	FUNCTION 5  gtsvector_penalty(internal,internal,internal),
+	FUNCTION 6  gtsvector_picksplit(internal,internal),
+	FUNCTION 7  gtsvector_same(gtsvector,gtsvector,internal);

src/tsvector2_conv.c

@@ -11,6 +11,7 @@
 
 #include "tsearch/ts_cache.h"
 #include "utils/builtins.h"
+#include "utils/jsonb.h"
 #include "utils/jsonapi.h"
 #include "tsearch/ts_utils.h"
 
@@ -22,8 +23,63 @@ typedef struct TSVectorBuildState
 	Oid			cfgId;
 } TSVectorBuildState;
 
+typedef void (*action_function) (void *state, char *elem_value, int elem_len);
 static void add_to_tsvector2(void *_state, char *elem_value, int elem_len);
 
+#ifdef __GNUC__
+__attribute__((unused))
+#endif
+static void
+collect_jsonb_strings(Jsonb *jb, void *state, action_function action)
+{
+	JsonbIterator *it;
+	JsonbValue	v;
+	JsonbIteratorToken type;
+
+	it = JsonbIteratorInit(&jb->root);
+
+	while ((type = JsonbIteratorNext(&it, &v, false)) != WJB_DONE)
+	{
+		if ((type == WJB_VALUE || type == WJB_ELEM) && v.type == jbvString)
+		{
+			action(state, v.val.string.val, v.val.string.len);
+		}
+	}
+}
+
+struct parseState {
+	action_function action;
+	void *action_state;
+};
+
+static void
+iterate_string_values_scalar(void *state, char *token, JsonTokenType tokentype)
+{
+	struct parseState *pstate = (struct parseState *) state;
+
+	if (tokentype == JSON_TOKEN_STRING)
+		(pstate->action) (pstate->action_state, token, strlen(token));
+}
+
+#ifdef __GNUC__
+__attribute__((unused))
+#endif
+static void
+collect_json_strings(text *json, void *action_state, action_function action)
+{
+	JsonLexContext *lex = makeJsonLexContext(json, true);
+	JsonSemAction *sem = palloc0(sizeof(JsonSemAction));
+	struct parseState *state = palloc0(sizeof(struct parseState));
+
+	state->action = action;
+	state->action_state = action_state;
+
+	sem->semstate = (void *) state;
+	sem->scalar = iterate_string_values_scalar;
+
+	pg_parse_json(lex, sem);
+}
+
 /*
  * Worker function for jsonb(_string)_to_tsvector2(_byid)
  */
@@ -41,7 +97,7 @@ jsonb_to_tsvector2_worker(Oid cfgId, Jsonb *jb, uint32 flags)
 #if PG_VERSION_NUM >= 110000
 	iterate_jsonb_values(jb, flags, &state, add_to_tsvector2);
 #else
-	iterate_jsonb_string_values(jb, &state, add_to_tsvector2);
+	collect_jsonb_strings(jb, &state, add_to_tsvector2);
 #endif
 
 	return make_tsvector2(&prs);
@@ -136,7 +192,7 @@ json_to_tsvector2_worker(Oid cfgId, text *json, uint32 flags)
 #if PG_VERSION_NUM >= 110000
 	iterate_json_values(json, flags, &state, add_to_tsvector2);
 #else
-	iterate_json_string_values(json, &state, add_to_tsvector2);
+	collect_json_strings(json, &state, add_to_tsvector2);
 #endif
 
 	return make_tsvector2(&prs);

src/tsvector2_op.c

@@ -23,7 +23,9 @@
 #include "parser/parse_coerce.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#if PG_VERSION_NUM >= 100000
 #include "utils/regproc.h"
+#endif
 #include "utils/rel.h"
 #include "tsearch/ts_utils.h"
 
@@ -2687,6 +2689,7 @@ tsvector2_update_trigger(PG_FUNCTION_ARGS, bool config_column)
 			pfree(txt);
 	}
 
+#if PG_VERSION_NUM >= 100000
 	/* make tsvector2 value */
 	if (prs.curwords)
 	{
@@ -2710,6 +2713,31 @@ tsvector2_update_trigger(PG_FUNCTION_ARGS, bool config_column)
 											 &datum, &isnull);
 		pfree(prs.words);
 	}
+#else
+	/* make tsvector2 value */
+	if (prs.curwords)
+	{
+		datum = PointerGetDatum(make_tsvector2(&prs));
+		rettuple = SPI_modifytuple(rel, rettuple, 1, &tsvector_attr_num,
+								   &datum, NULL);
+		pfree(DatumGetPointer(datum));
+	}
+	else
+	{
+		TSVector2	out = palloc(CALCDATASIZE(0, 0));
+
+		SET_VARSIZE(out, tsvector2_calcsize(0, 0));
+		out->size = 0;
+		datum = PointerGetDatum(out);
+		rettuple = SPI_modifytuple(rel, rettuple, 1, &tsvector_attr_num,
+								   &datum, NULL);
+		pfree(prs.words);
+	}
+
+	if (rettuple == NULL)		/* internal error */
+		elog(ERROR, "tsvector_update_trigger: %d returned by SPI_modifytuple",
+			 SPI_result);
+#endif
 
 	return PointerGetDatum(rettuple);
 }

src/tsvector2_sel.c

@@ -138,7 +138,7 @@ tsvector2_matchjoinsel(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(DEFAULT_TS_MATCH_SEL);
 }
 
-
+#if PG_VERSION_NUM >= 100000
 /*
  * @@ selectivity for tsvector2 var vs tsquery constant
  */
@@ -195,6 +195,70 @@ tsquerysel(VariableStatData *vardata, Datum constval)
 
 	return selec;
 }
+#else
+/*
+ * @@ selectivity for tsvector var vs tsquery constant
+ */
+static Selectivity
+tsquerysel(VariableStatData *vardata, Datum constval)
+{
+	Selectivity selec;
+	TSQuery		query;
+
+	/* The caller made sure the const is a TSQuery, so get it now */
+	query = DatumGetTSQuery(constval);
+
+	/* Empty query matches nothing */
+	if (query->size == 0)
+		return (Selectivity) 0.0;
+
+	if (HeapTupleIsValid(vardata->statsTuple))
+	{
+		Form_pg_statistic stats;
+		Datum	   *values;
+		int			nvalues;
+		float4	   *numbers;
+		int			nnumbers;
+
+		stats = (Form_pg_statistic) GETSTRUCT(vardata->statsTuple);
+
+		/* MCELEM will be an array of TEXT elements for a tsvector column */
+		if (get_attstatsslot(vardata->statsTuple,
+							 TEXTOID, -1,
+							 STATISTIC_KIND_MCELEM, InvalidOid,
+							 NULL,
+							 &values, &nvalues,
+							 &numbers, &nnumbers))
+		{
+			/*
+			 * There is a most-common-elements slot for the tsvector Var, so
+			 * use that.
+			 */
+			selec = mcelem_tsquery_selec(query, values, nvalues,
+										 numbers, nnumbers);
+			free_attstatsslot(TEXTOID, values, nvalues, numbers, nnumbers);
+		}
+		else
+		{
+			/* No most-common-elements info, so do without */
+			selec = tsquery_opr_selec_no_stats(query);
+		}
+
+		/*
+		 * MCE stats count only non-null rows, so adjust for null rows.
+		 */
+		selec *= (1.0 - stats->stanullfrac);
+	}
+	else
+	{
+		/* No stats at all, so do without */
+		selec = tsquery_opr_selec_no_stats(query);
+		/* we assume no nulls here, so no stanullfrac correction */
+	}
+
+	return selec;
+}
+#endif
 
 /*
  * Extract data from the pg_statistic arrays into useful format.