Fix contrib/pg_trgm's similarity() function for trigram-free strings.

tglsfdc · tglsfdc · commit f73a16340c3e · 2013-02-13T14:07:17.000-05:00
Cases such as similarity('', '') produced a NaN result due to computing
0/0.  Per discussion, make it return zero instead.

This appears to be the basic cause of bug #7867 from Michele Baravalle,
although it remains unclear why her installation doesn't think Cyrillic
letters are letters.

Back-patch to all active branches.
diff --git a/contrib/pg_trgm/expected/pg_trgm.out b/contrib/pg_trgm/expected/pg_trgm.out
@@ -53,6 +53,12 @@ select similarity('wow',' WOW ');
           1
 (1 row)
 
+select similarity('---', '####---');
+ similarity 
+------------
+          0
+(1 row)
+
 CREATE TABLE test_trgm(t text);
 \copy test_trgm from 'data/trgm.data
 select t,similarity(t,'qwertyu0988') as sml from test_trgm where t % 'qwertyu0988' order by sml desc, t;
diff --git a/contrib/pg_trgm/sql/pg_trgm.sql b/contrib/pg_trgm/sql/pg_trgm.sql
@@ -11,6 +11,8 @@ select show_trgm('a b C0*%^');
 select similarity('wow','WOWa ');
 select similarity('wow',' WOW ');
 
+select similarity('---', '####---');
+
 CREATE TABLE test_trgm(t text);
 
 \copy test_trgm from 'data/trgm.data
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
@@ -554,6 +554,10 @@ cnt_sml(TRGM *trg1, TRGM *trg2)
 	len1 = ARRNELEM(trg1);
 	len2 = ARRNELEM(trg2);
 
+	/* explicit test is needed to avoid 0/0 division when both lengths are 0 */
+	if (len1 <= 0 || len2 <= 0)
+		return (float4) 0.0;
+
 	while (ptr1 - GETARR(trg1) < len1 && ptr2 - GETARR(trg2) < len2)
 	{
 		int			res = CMPTRGM(ptr1, ptr2);
@@ -571,9 +575,9 @@ cnt_sml(TRGM *trg1, TRGM *trg2)
 	}
 
 #ifdef DIVUNION
-	return ((((float4) count) / ((float4) (len1 + len2 - count))));
+	return ((float4) count) / ((float4) (len1 + len2 - count));
 #else
-	return (((float) count) / ((float) ((len1 > len2) ? len1 : len2)));
+	return ((float4) count) / ((float4) ((len1 > len2) ? len1 : len2));
 #endif
 
 }

Original file line number	Diff line number	Diff line change
`@@ -554,6 +554,10 @@ cnt_sml(TRGM trg1, TRGM trg2)`
`554`	`554`	`len1 = ARRNELEM(trg1);`
`555`	`555`	`len2 = ARRNELEM(trg2);`
`556`	`556`
	`557`	`+ /* explicit test is needed to avoid 0/0 division when both lengths are 0 */`
	`558`	`+ if (len1 <= 0 \|\| len2 <= 0)`
	`559`	`+ return (float4) 0.0;`
	`560`	`+`
`557`	`561`	`while (ptr1 - GETARR(trg1) < len1 && ptr2 - GETARR(trg2) < len2)`
`558`	`562`	`{`
`559`	`563`	`int res = CMPTRGM(ptr1, ptr2);`
`@@ -571,9 +575,9 @@ cnt_sml(TRGM trg1, TRGM trg2)`
`571`	`575`	`}`
`572`	`576`
`573`	`577`	`#ifdef DIVUNION`
`574`		`- return ((((float4) count) / ((float4) (len1 + len2 - count))));`
	`578`	`+ return ((float4) count) / ((float4) (len1 + len2 - count));`
`575`	`579`	`#else`
`576`		`- return (((float) count) / ((float) ((len1 > len2) ? len1 : len2)));`
	`580`	`+ return ((float4) count) / ((float4) ((len1 > len2) ? len1 : len2));`
`577`	`581`	`#endif`
`578`	`582`
`579`	`583`	`}`