Commit9a35dd2

Alena Rybakina

committed

Add processing cases with selectivities are equal as -1.

Add assert check on NaN values.

1 parent10745e3 commit9a35dd2Copy full SHA for 9a35dd2

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 2 additions & 1 deletion

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`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,10 @@ fs_distance(double a, double b, int len)`
`69`	`69`	`inti;`
`70`	`70`
`71`	`71`	`for (i=0;i<len;++i)`
	`72`	`+{`
	`73`	`+Assert(!isnan(a[i]));`
`72`	`74`	`res+= (a[i]-b[i])* (a[i]-b[i]);`
	`75`	`+}`
`73`	`76`	`if (len!=0)`
`74`	`77`	`res=sqrt(res /len);`
`75`	`78`	`returnres;`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,11 @@ restore_selectivities(List clauselist, List relidslist, JoinType join_type,`
`216`	`216`	`else`
`217`	`217`	`cur_sel=&rinfo->outer_selec;`
`218`	`218`
	`219`	`+if (*cur_sel<0)`
	`220`	`+*cur_sel=0;`
	`221`	`+`
	`222`	`+Assert(cur_sel>0);`
	`223`	`+`
`219`	`224`	`lst=lappend(lst,cur_sel);`
`220`	`225`	`i++;`
`221`	`226`	`}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,10 @@ form_matrix(double *matrix, int nrows, int ncols)`
`145`	`145`	`elems=palloc(sizeof(elems)nrows*ncols);`
`146`	`146`	`for (i=0;i<nrows;++i)`
`147`	`147`	`for (j=0;j<ncols;++j)`
	`148`	`+{`
`148`	`149`	`elems[incols+j]=Float8GetDatum(matrix[incols+j]);`
	`150`	`+Assert(!isnan(matrix[i*ncols+j]));`
	`151`	`+}`
`149`	`152`
`150`	`153`	`array=construct_md_array(elems,NULL,2,dims,lbs,`
`151`	`154`	`FLOAT8OID,8,FLOAT8PASSBYVAL,'d');`

Comments

(0)