Merge branch 'PGPRO_pg_trgm' into PGPRO9_5

vbwagner · vbwagner · commit b3aede4cbdac · 2016-03-22T13:51:56.000+03:00
diff --git a/contrib/pg_trgm/data/trgm2.data b/contrib/pg_trgm/data/trgm2.data
@@ -693,4 +693,4 @@ Maramech Hill
 Maramech Woods Nature Preserve
 Oued Karakech
 Samarra School
-Jangal-e Marakeh Sar
+Jangal-e Marakeh Sar
diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c
@@ -210,7 +210,7 @@ gin_trgm_consistent(PG_FUNCTION_ARGS)
 			 * And again, c (ntrue) is a lower bound of len2, but c <= len1
 			 * just by definition and, consequently, upper bound of
 			 * similarity is just c / len1.
-			 * So, independly on DIVUNION the upper bound formula is the same.
+			 * So, independently on DIVUNION the upper bound formula is the same.
 			 */
 			res = (nkeys == 0) ? false :
 				(((((float4) ntrue) / ((float4) nkeys))) >= nlimit);
@@ -330,7 +330,7 @@ gin_trgm_triconsistent(PG_FUNCTION_ARGS)
 			else
 			{
 				/*
-				 * As trigramsMatchGraph implements a montonic boolean function,
+				 * As trigramsMatchGraph implements a monotonic boolean function,
 				 * promoting all GIN_MAYBE keys to GIN_TRUE will give a
 				 * conservative result.
 				 */
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
@@ -9,6 +9,7 @@
 
 #include "catalog/pg_type.h"
 #include "tsearch/ts_locale.h"
+#include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/pg_crc.h"
 
@@ -80,12 +81,17 @@ Datum
 set_limit(PG_FUNCTION_ARGS)
 {
 	float4		nlimit = PG_GETARG_FLOAT4(0);
+	char	   *nlimit_str;
+	Oid			func_out_oid;
+	bool		is_varlena;
+
+	getTypeOutputInfo(FLOAT4OID, &func_out_oid, &is_varlena);
+
+	nlimit_str = OidOutputFunctionCall(func_out_oid, Float4GetDatum(nlimit));
+
+	SetConfigOption("pg_trgm.similarity_threshold", nlimit_str,
+					PGC_USERSET, PGC_S_SESSION);
 
-	if (nlimit < 0 || nlimit > 1.0)
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("wrong threshold, should be between 0 and 1")));
-	similarity_threshold = nlimit;
 	PG_RETURN_FLOAT4(similarity_threshold);
 }
 
@@ -622,7 +628,7 @@ calc_word_similarity(char *str1, int slen1, char *str2, int slen2,
 
 
 /*
- * Extract the next non-wildcard part of a search string, ie, a word bounded
+ * Extract the next non-wildcard part of a search string, i.e. a word bounded
  * by '_' or '%' meta-characters, non-word characters or string end.
  *
  * str: source string, of length lenstr bytes (need not be null-terminated)
diff --git a/doc/src/sgml/pgtrgm.sgml b/doc/src/sgml/pgtrgm.sgml
@@ -92,10 +92,11 @@
       <entry><type>real</type></entry>
       <entry>
        Returns a number that indicates how similar the first string
-       to the most similar word of the second string.  The range of
-       the result is zero (indicating that the two strings are completely
-       dissimilar) to one (indicating that the first string is identical
-       to one of the word of the second string).
+       to the most similar word of the second string. The function searches in
+       the second string a most similar word not a most similar substring.  The
+       range of the result is zero (indicating that the two strings are
+       completely dissimilar) to one (indicating that the first string is
+       identical to one of the word of the second string).
       </entry>
      </row>
      <row>
@@ -155,9 +156,9 @@
       <entry><type>text</> <literal>%&gt;</literal> <type>text</></entry>
       <entry><type>boolean</type></entry>
       <entry>
-       Returns <literal>true</> if its first argument have a word which is the
-       similar word to the second argument and they have a similarity
-       that is greater than the current word similarity threshold set by
+       Returns <literal>true</> if its first argument has the similar word in
+       the second argument and they have a similarity that is greater than the
+       current word similarity threshold set by
        <varname>pg_trgm.word_similarity_threshold</> parameter.
       </entry>
      </row>
