Changeset: 531a845f0f1b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=531a845f0f1b
Modified Files:
Branch: Dec2011
Log Message:
merged
diffs (48 lines):
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -4291,11 +4291,14 @@ bat@2_2time_@1( int *res, int *bid, int
BATaccessBegin(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BATloop(b,p,q) {
@3 *v = (@3*)BUNtail(bi,p);
- @1 r;
- msg = @2_2time_@1( &r, @4, digits );
+ union {
+ lng l;
+ @1 r;
+ } u;
+ msg = @2_2time_@1( &u.r, @4, digits );
if (msg)
break;
- BUNins(dst, BUNhead(bi,p), &r, FALSE);
+ BUNins(dst, BUNhead(bi,p), &u.r, FALSE);
}
BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -547,14 +547,19 @@ find_one_rel(list *rels, sql_exp *e)
static int
joinexp_cmp(list *rels, sql_exp *h, sql_exp *key)
{
- sql_rel *h_l = find_rel(rels, h->l);
- sql_rel *h_r = find_rel(rels, h->r);
- sql_rel *key_l = find_rel(rels, key->l);
- sql_rel *key_r = find_rel(rels, key->r);
+ sql_rel *h_l;
+ sql_rel *h_r;
+ sql_rel *key_l;
+ sql_rel *key_r;
assert (!h || !key || (h->type == e_cmp && key->type == e_cmp));
if (is_complex_exp(h->flag) || is_complex_exp(key->flag))
return -1;
+ h_l = find_rel(rels, h->l);
+ h_r = find_rel(rels, h->r);
+ key_l = find_rel(rels, key->l);
+ key_r = find_rel(rels, key->r);
+
if (h_l == key_l && h_r == key_r)
return 0;
if (h_r == key_l && h_l == key_r)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
