Changeset: 28028c38d95a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=28028c38d95a
Modified Files:
sql/server/rel_planner.c
Branch: default
Log Message:
more lng vs dbl
diffs (39 lines):
diff --git a/sql/server/rel_planner.c b/sql/server/rel_planner.c
--- a/sql/server/rel_planner.c
+++ b/sql/server/rel_planner.c
@@ -322,7 +322,7 @@ rel_exp_selectivity(mvc *sql, sql_rel *r
break;
}
case cmp_notequal:
- sel = (dcount-1)/dcount;
+ sel = (dcount-1.0)/dcount;
break;
case cmp_gt:
case cmp_gte:
@@ -330,7 +330,7 @@ rel_exp_selectivity(mvc *sql, sql_rel *r
case cmp_lte: {
void *min, *max;
if (exp_getranges( sql, r, e->l, &min, &max )) {
- sel = exp_getrange_sel( sql, r, e, min, max);
+ sel = (dbl)exp_getrange_sel( sql, r, e, min,
max);
} else {
sel = 0.5;
if (e->f) /* range */
@@ -472,7 +472,7 @@ memo_create(mvc *sql, list *rels )
mi->count = MAX( (lng) (mi->count*sel), 1);
assert(mi->count);
mi->width = rel_getwidth(sql, r);
- mi->cost = mi->count*mi->width;
+ mi->cost = (dbl)(mi->count*mi->width);
mi->data = r;
append(mi->rels, r);
}
@@ -502,7 +502,7 @@ memo_add_exps(list *memo, mvc *sql, list
mi = memoitem_create(memo, sql->sa, mj->l->name,
mj->r->name, 2);
mi->width = (rel_getwidth(sql, l) + rel_getwidth(sql,
r))/2;
mi->data = e;
- mi->count = mj->sel * MIN(mj->l->count, mj->r->count);
+ mi->count = (lng)(mj->sel * MIN(mj->l->count,
mj->r->count));
append(mi->rels, l);
append(mi->rels, r);
append(mi->exps, e);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
