Fix the cnt_sml optimization by gcc

Artur Zakirov · Artur Zakirov · commit 6ecaed94134a · 2016-02-09T15:44:55.000+03:00
diff --git a/contrib/pg_trgm/expected/pg_subword_trgm.out b/contrib/pg_trgm/expected/pg_subword_trgm.out
@@ -69,15 +69,15 @@ select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Ka
 (4 rows)
 
 select t <->> 'Kabankala', t from test_trgm2 order by t <->> 'Kabankala' limit 7;
-     ?column?      |                t                 
--------------------+----------------------------------
-                 0 | Kabankala
- 0.100000023841858 | Kabankalan City Public Plaza
- 0.300000011920929 | Abankala
- 0.399999976158142 | Ntombankala School
- 0.416666686534882 | Kabakala
-               0.5 | Nehalla Bankalah Reserved Forest
- 0.538461536169052 | Kabikala
+ ?column? |                t                 
+----------+----------------------------------
+        0 | Kabankala
+      0.1 | Kabankalan City Public Plaza
+      0.3 | Abankala
+      0.4 | Ntombankala School
+ 0.416667 | Kabakala
+      0.5 | Nehalla Bankalah Reserved Forest
+ 0.538462 | Kabikala
 (7 rows)
 
 create index trgm_idx2 on test_trgm2 using gist (t gist_trgm_ops);
@@ -160,15 +160,15 @@ select t <->> 'Kabankala', t from test_trgm2 order by t <->> 'Kabankala' limit 7
 (3 rows)
 
 select t <->> 'Kabankala', t from test_trgm2 order by t <->> 'Kabankala' limit 7;
-     ?column?      |                t                 
--------------------+----------------------------------
-                 0 | Kabankala
- 0.100000023841858 | Kabankalan City Public Plaza
- 0.300000011920929 | Abankala
- 0.399999976158142 | Ntombankala School
- 0.416666686534882 | Kabakala
-               0.5 | Nehalla Bankalah Reserved Forest
- 0.538461536169052 | Kabikala
+ ?column? |                t                 
+----------+----------------------------------
+        0 | Kabankala
+      0.1 | Kabankalan City Public Plaza
+      0.3 | Abankala
+      0.4 | Ntombankala School
+ 0.416667 | Kabakala
+      0.5 | Nehalla Bankalah Reserved Forest
+ 0.538462 | Kabikala
 (7 rows)
 
 drop index trgm_idx2;
diff --git a/contrib/pg_trgm/pg_trgm--1.1--1.2.sql b/contrib/pg_trgm/pg_trgm--1.1--1.2.sql
@@ -19,12 +19,12 @@ AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT STABLE;  -- stable because depends on pg_trgm.subword_limit
 
 CREATE FUNCTION subword_similarity_dist_op(text,text)
-RETURNS float8
+RETURNS float4
 AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE FUNCTION subword_similarity_dist_commutator_op(text,text)
-RETURNS float8
+RETURNS float4
 AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT IMMUTABLE;
 
diff --git a/contrib/pg_trgm/pg_trgm--1.2.sql b/contrib/pg_trgm/pg_trgm--1.2.sql
@@ -85,12 +85,12 @@ CREATE OPERATOR <-> (
 );
 
 CREATE FUNCTION subword_similarity_dist_op(text,text)
-RETURNS float8
+RETURNS float4
 AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT IMMUTABLE;
 
 CREATE FUNCTION subword_similarity_dist_commutator_op(text,text)
-RETURNS float8
+RETURNS float4
 AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT IMMUTABLE;
 
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
@@ -471,7 +471,8 @@ gtrgm_distance(PG_FUNCTION_ARGS)
 			*recheck = strategy == SubwordDistanceStrategyNumber;
 			if (GIST_LEAF(entry))
 			{					/* all leafs contains orig trgm */
-				res = 1.0 - cnt_sml(qtrg, key, *recheck);
+				float4 volatile sml = cnt_sml(qtrg, key, *recheck);
+				res = 1.0 - sml;
 			}
 			else if (ISALLTRUE(key))
 			{					/* all leafs contains orig trgm */
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
@@ -1140,7 +1140,7 @@ subword_similarity_dist_op(PG_FUNCTION_ARGS)
 
 	PG_FREE_IF_COPY(in1, 0);
 	PG_FREE_IF_COPY(in2, 1);
-	PG_RETURN_FLOAT8(1.0 - res);
+	PG_RETURN_FLOAT4(1.0 - res);
 }
 
 Datum
@@ -1156,5 +1156,5 @@ subword_similarity_dist_commutator_op(PG_FUNCTION_ARGS)
 
 	PG_FREE_IF_COPY(in1, 0);
 	PG_FREE_IF_COPY(in2, 1);
-	PG_RETURN_FLOAT8(1.0 - res);
+	PG_RETURN_FLOAT4(1.0 - res);
 }

Original file line number	Diff line number	Diff line change
`@@ -1140,7 +1140,7 @@ subword_similarity_dist_op(PG_FUNCTION_ARGS)`
`1140`	`1140`
`1141`	`1141`	`PG_FREE_IF_COPY(in1, 0);`
`1142`	`1142`	`PG_FREE_IF_COPY(in2, 1);`
`1143`		`- PG_RETURN_FLOAT8(1.0 - res);`
	`1143`	`+ PG_RETURN_FLOAT4(1.0 - res);`
`1144`	`1144`	`}`
`1145`	`1145`
`1146`	`1146`	`Datum`
`@@ -1156,5 +1156,5 @@ subword_similarity_dist_commutator_op(PG_FUNCTION_ARGS)`
`1156`	`1156`
`1157`	`1157`	`PG_FREE_IF_COPY(in1, 0);`
`1158`	`1158`	`PG_FREE_IF_COPY(in2, 1);`
`1159`		`- PG_RETURN_FLOAT8(1.0 - res);`
	`1159`	`+ PG_RETURN_FLOAT4(1.0 - res);`
`1160`	`1160`	`}`