MonetDB: geo-update - merged with default

[Niels Nes]

Changeset: 7cc4ad9cf53d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7cc4ad9cf53d
Branch: geo-update
Log Message:

merged with default


diffs (68 lines):

diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -1815,7 +1815,7 @@ exp_deps(mvc *sql, sql_exp *e, list *ref
                }
                break;
        case e_atom:
-               if (e->f && exp_deps(sql, e->f, refs, l) != 0)
+               if (e->f && exps_deps(sql, e->f, refs, l) != 0)
                        return -1;
                break;
        case e_column:
@@ -2195,6 +2195,7 @@ rel_exp_visitor_bottomup(visitor *v, sql
 }
 
 static list *exps_rel_visitor(visitor *v, list *exps, rel_rewrite_fptr 
rel_rewriter, bool topdown);
+static list *exps_exps_rel_visitor(visitor *v, list *lists, rel_rewrite_fptr 
rel_rewriter, bool topdown);
 
 static sql_exp *
 exp_rel_visitor(visitor *v, sql_exp *e, rel_rewrite_fptr rel_rewriter, bool 
topdown)
@@ -2213,7 +2214,7 @@ exp_rel_visitor(visitor *v, sql_exp *e, 
        case e_aggr:
        case e_func:
                if (e->r) /* rewrite rank */
-                       if ((e->r = exps_rel_visitor(v, e->r, rel_rewriter, 
topdown)) == NULL)
+                       if ((e->r = exps_exps_rel_visitor(v, e->r, 
rel_rewriter, topdown)) == NULL)
                                return NULL;
                if (e->l)
                        if ((e->l = exps_rel_visitor(v, e->l, rel_rewriter, 
topdown)) == NULL)
@@ -2278,6 +2279,17 @@ exps_rel_visitor(visitor *v, list *exps,
        return exps;
 }
 
+static list *
+exps_exps_rel_visitor(visitor *v, list *lists, rel_rewrite_fptr rel_rewriter, 
bool topdown)
+{
+       if (list_empty(lists))
+               return lists;
+       for (node *n = lists->h; n; n = n->next)
+               if (n->data && (n->data = exps_rel_visitor(v, n->data, 
rel_rewriter, topdown)) == NULL)
+                       return NULL;
+       return lists;
+}
+
 static inline sql_rel *
 do_rel_visitor(visitor *v, sql_rel *rel, rel_rewrite_fptr rel_rewriter, bool 
topdown)
 {
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -6828,7 +6828,7 @@ sql_trans_create_table_trigger(sql_trigg
                        return res;
                }
        }
-       oid tid = t? (oid) t->base.id : oid_nil;
+       sqlid tid = t? t->base.id : int_nil;
 
        if ((res = store->table_api.table_insert(tr, systrigger, &nt->base.id, 
&nt->base.name, &tid, &nt->time, &nt->orientation,
                                                         &nt->event, 
(nt->old_name)?&nt->old_name:&strnil, (nt->new_name)?&nt->new_name:&strnil,
@@ -6878,7 +6878,7 @@ sql_trans_create_trigger(sql_trigger **t
                trigger_destroy(store, nt);
                return res;
        }
-       oid tid = oid_nil;
+       sqlid tid = oid_nil;
 
        if ((res = store->table_api.table_insert(tr, systrigger, &nt->base.id, 
&nt->base.name, &tid, &nt->time, &nt->orientation,
                                                         &nt->event, 
(nt->old_name)?&nt->old_name:&strnil, (nt->new_name)?&nt->new_name:&strnil,
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org