Add processing cases with selectivities are equal as -1.

Alena Rybakina · Alena Rybakina · commit eb87e74a327d · 2022-09-08T13:57:59.000+03:00
Add assert check on NaN values.
diff --git a/hash.c b/hash.c
@@ -260,6 +260,7 @@ get_fss_for_object(List *relsigns, List *clauselist,
 		if (nfeatures != NULL)
 		{
 			(*features)[inverse_idx[i]] = log(*s);
+			Assert(!isnan(log(*s)));
 			if ((*features)[inverse_idx[i]] < log_selectivity_lower_bound)
 				(*features)[inverse_idx[i]] = log_selectivity_lower_bound;
 		}
@@ -693,7 +694,7 @@ get_eclasses(List *clauselist, int *nargs, int **args_hash, int **eclass_hash)
 	e_hashes = palloc((*nargs) * sizeof(*e_hashes));
 
 	MemoryContextSwitchTo(old_ctx_m);
-	
+
 	for (i = 0; i < *nargs; ++i)
 		lsts[i] = NIL;
 
diff --git a/machine_learning.c b/machine_learning.c
@@ -69,7 +69,10 @@ fs_distance(double *a, double *b, int len)
 	int			i;
 
 	for (i = 0; i < len; ++i)
+	{
+		Assert(!isnan(a[i]));
 		res += (a[i] - b[i]) * (a[i] - b[i]);
+	}
 	if (len != 0)
 		res = sqrt(res / len);
 	return res;
diff --git a/postprocessing.c b/postprocessing.c
@@ -214,6 +214,11 @@ restore_selectivities(List *clauselist, List *relidslist, JoinType join_type,
 		else
 			cur_sel = &rinfo->outer_selec;
 
+		if (*cur_sel < 0)
+			*cur_sel = 0;
+
+		Assert(cur_sel > 0);
+
 		lst = lappend(lst, cur_sel);
 		i++;
 	}
diff --git a/storage.c b/storage.c
@@ -145,7 +145,10 @@ form_matrix(double *matrix, int nrows, int ncols)
 	elems = palloc(sizeof(*elems) * nrows * ncols);
 	for (i = 0; i < nrows; ++i)
 		for (j = 0; j < ncols; ++j)
+		{
 			elems[i * ncols + j] = Float8GetDatum(matrix[i * ncols + j]);
+			Assert(!isnan(matrix[i * ncols + j]));
+		}
 
 	array = construct_md_array(elems, NULL, 2, dims, lbs,
 							   FLOAT8OID, 8, FLOAT8PASSBYVAL, 'd');

Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,7 @@ get_fss_for_object(List relsigns, List clauselist,`
`260`	`260`	`if (nfeatures != NULL)`
`261`	`261`	`{`
`262`	`262`	`(features)[inverse_idx[i]] = log(s);`
	`263`	`+ Assert(!isnan(log(*s)));`
`263`	`264`	`if ((*features)[inverse_idx[i]] < log_selectivity_lower_bound)`
`264`	`265`	`(*features)[inverse_idx[i]] = log_selectivity_lower_bound;`
`265`	`266`	`}`
`@@ -693,7 +694,7 @@ get_eclasses(List clauselist, int nargs, int args_hash, int eclass_hash)`
`693`	`694`	`e_hashes = palloc((nargs) sizeof(*e_hashes));`
`694`	`695`
`695`	`696`	`MemoryContextSwitchTo(old_ctx_m);`
`696`		`-`
	`697`	`+`
`697`	`698`	`for (i = 0; i < *nargs; ++i)`
`698`	`699`	`lsts[i] = NIL;`
`699`	`700`