Avoided fmax usage in aqo

Oleg Ivanov · Oleg Ivanov · commit df6a6d0be258 · 2017-09-26T12:00:57.000+03:00
diff --git a/contrib/aqo/aqo.h b/contrib/aqo/aqo.h
@@ -328,12 +328,4 @@ void cache_selectivity(int clause_hash,
 double	   *selectivity_cache_find_global_relid(int clause_hash, int global_relid);
 void		selectivity_cache_clear(void);
 
-#ifndef fmax
-#define fmax(a, b) ((a > b) ? (a) : (b))
-#endif
-
-#ifndef isfinite
-#define isfinite(x) (-INFINITY < (x) && (x) < INFINITY)
-#endif
-
 #endif
diff --git a/contrib/aqo/hash.c b/contrib/aqo/hash.c
@@ -118,8 +118,9 @@ get_fss_for_object(List *clauselist, List *selectivities, List *relidslist,
 	i = 0;
 	foreach(l, selectivities)
 	{
-		(*features)[inverse_idx[i]] = fmax(log_selectivity_lower_bound,
-										   log(*((double *) (lfirst(l)))));
+		(*features)[inverse_idx[i]] = log(*((double *) (lfirst(l))));
+		if ((*features)[inverse_idx[i]] < log_selectivity_lower_bound)
+			(*features)[inverse_idx[i]] = log_selectivity_lower_bound;
 		sorted_clauses[inverse_idx[i]] = clause_hashes[i];
 		i++;
 	}

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,9 @@ get_fss_for_object(List clauselist, List selectivities, List *relidslist,`
`118`	`118`	`i = 0;`
`119`	`119`	`foreach(l, selectivities)`
`120`	`120`	`{`
`121`		`- (*features)[inverse_idx[i]] = fmax(log_selectivity_lower_bound,`
`122`		`- log(((double ) (lfirst(l)))));`
	`121`	`+ (features)[inverse_idx[i]] = log(((double *) (lfirst(l))));`
	`122`	`+ if ((*features)[inverse_idx[i]] < log_selectivity_lower_bound)`
	`123`	`+ (*features)[inverse_idx[i]] = log_selectivity_lower_bound;`
`123`	`124`	`sorted_clauses[inverse_idx[i]] = clause_hashes[i];`
`124`	`125`	`i++;`
`125`	`126`	`}`