Changeset: 777f9c12d150 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/777f9c12d150
Modified Files:
sql/common/sql_list.c
sql/server/rel_unnest.c
Branch: resource_management
Log Message:
we only mark exps free for now
diffs (35 lines):
diff --git a/sql/common/sql_list.c b/sql/common/sql_list.c
--- a/sql/common/sql_list.c
+++ b/sql/common/sql_list.c
@@ -725,7 +725,8 @@ list_join(list *l, list *data)
assert(!l->ht);
if (!data->t) {
- sa_free(data->sa, data);
+ // don't free anything but expr for now
+ //sa_free(data->sa, data);
return l;
}
if (!l->h)
@@ -734,7 +735,8 @@ list_join(list *l, list *data)
l->t->next = data->h;
l->cnt += data->cnt;
l->t = data->t;
- sa_free(data->sa, data);
+ // don't free anything but expr for now
+ //sa_free(data->sa, data);
return l;
}
diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -4014,7 +4014,7 @@ rewrite_fix_count(visitor *v, sql_rel *r
list *args, *targs;
sql_subfunc *isnil =
sql_bind_func(v->sql, "sys", "isnull", exp_subtype(e), NULL, F_FUNC, true,
true), *ifthen;
- ne = exp_unop(v->sql->sa, e, isnil);
+ ne = exp_unop(v->sql->sa,
exp_copy(v->sql, e), isnil);
set_has_no_nil(ne);
targs = sa_list(v->sql->sa);
append(targs,
sql_bind_localtype("bit"));
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
