Commit589647a

Artur Zakirov

committed

pg_trgm's set_limit() now uses SetConfigOption()

1 parentd2e4622 commit589647aCopy full SHA for 589647a

File tree

+15

-9

lines changed

+15

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -693,4 +693,4 @@ Maramech Hill`
`693`	`693`	`Maramech Woods Nature Preserve`
`694`	`694`	`Oued Karakech`
`695`	`695`	`Samarra School`
`696`		`-Jangal-e Marakeh Sar`
	`696`	`+Jangal-e Marakeh Sar`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ gin_trgm_consistent(PG_FUNCTION_ARGS)`
`210`	`210`	`* And again, c (ntrue) is a lower bound of len2, but c <= len1`
`211`	`211`	`* just by definition and, consequently, upper bound of`
`212`	`212`	`* similarity is just c / len1.`
`213`		`- * So,independly on DIVUNION the upper bound formula is the same.`
	`213`	`+ * So,independently on DIVUNION the upper bound formula is the same.`
`214`	`214`	`*/`
`215`	`215`	`res= (nkeys==0) ? false :`
`216`	`216`	`(((((float4)ntrue) / ((float4)nkeys))) >=nlimit);`
`@@ -330,7 +330,7 @@ gin_trgm_triconsistent(PG_FUNCTION_ARGS)`
`330`	`330`	`else`
`331`	`331`	`{`
`332`	`332`	`/*`
`333`		`- * As trigramsMatchGraph implements amontonic boolean function,`
	`333`	`+ * As trigramsMatchGraph implements amonotonic boolean function,`
`334`	`334`	`* promoting all GIN_MAYBE keys to GIN_TRUE will give a`
`335`	`335`	`* conservative result.`
`336`	`336`	`*/`

Lines changed: 12 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`#include"catalog/pg_type.h"`
`11`	`11`	`#include"tsearch/ts_locale.h"`
	`12`	`+#include"utils/lsyscache.h"`
`12`	`13`	`#include"utils/memutils.h"`
`13`	`14`	`#include"utils/pg_crc.h"`
`14`	`15`
`@@ -80,12 +81,17 @@ Datum`
`80`	`81`	`set_limit(PG_FUNCTION_ARGS)`
`81`	`82`	`{`
`82`	`83`	`float4nlimit=PG_GETARG_FLOAT4(0);`
	`84`	`+char*nlimit_str;`
	`85`	`+Oidfunc_out_oid;`
	`86`	`+boolis_varlena;`
	`87`	`+`
	`88`	`+getTypeOutputInfo(FLOAT4OID,&func_out_oid,&is_varlena);`
	`89`	`+`
	`90`	`+nlimit_str=OidOutputFunctionCall(func_out_oid,Float4GetDatum(nlimit));`
	`91`	`+`
	`92`	`+SetConfigOption("pg_trgm.similarity_threshold",nlimit_str,`
	`93`	`+PGC_USERSET,PGC_S_SESSION);`
`83`	`94`
`84`		`-if (nlimit<0\|\|nlimit>1.0)`
`85`		`-ereport(ERROR,`
`86`		`-(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),`
`87`		`-errmsg("wrong threshold, should be between 0 and 1")));`
`88`		`-similarity_threshold=nlimit;`
`89`	`95`	`PG_RETURN_FLOAT4(similarity_threshold);`
`90`	`96`	`}`
`91`	`97`
`@@ -622,7 +628,7 @@ calc_word_similarity(char str1, int slen1, char str2, int slen2,`
`622`	`628`
`623`	`629`
`624`	`630`	`/*`
`625`		`- * Extract the next non-wildcard part of a search string,ie, a word bounded`
	`631`	`+ * Extract the next non-wildcard part of a search string,i.e. a word bounded`
`626`	`632`	`* by '_' or '%' meta-characters, non-word characters or string end.`
`627`	`633`	`*`
`628`	`634`	`* str: source string, of length lenstr bytes (need not be null-terminated)`

Comments

(0)