Changeset: 1b4de4e13cc8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1b4de4e13cc8
Modified Files:
sql/server/rel_exp.c
sql/server/rel_optimize_proj.c
Branch: resource_management
Log Message:
make clang happy
diffs (50 lines):
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -3962,5 +3962,7 @@ free_exp(allocator *sa, sql_exp *e)
case e_aggr:
case e_convert:
case e_psm:
+ // TODO
+ ;
}
}
diff --git a/sql/server/rel_optimize_proj.c b/sql/server/rel_optimize_proj.c
--- a/sql/server/rel_optimize_proj.c
+++ b/sql/server/rel_optimize_proj.c
@@ -537,14 +537,15 @@ rel_push_project_up_(visitor *v, sql_rel
exps = new_exp_list(v->sql->sa);
for (n = l->exps->h; n; n = n->next) {
sql_exp *e = n->data;
- sql_exp *e_copy = exp_copy(v->sql, e);
/* we cannot rewrite projection with atomic
values from outer joins */
if (is_column(e->type) && exp_is_atom(e) &&
!(is_right(rel->op) || is_full(rel->op))) {
+ sql_exp *e_copy = exp_copy(v->sql, e);
list_append(exps, e_copy);
} else if (e->type == e_column) {
if (has_label(e))
return rel;
+ sql_exp *e_copy = exp_copy(v->sql, e);
list_append(exps, e_copy);
} else {
return rel;
@@ -561,15 +562,16 @@ rel_push_project_up_(visitor *v, sql_rel
for (n = r->exps->h; n; n = n->next) {
sql_exp *e = n->data;
- sql_exp *e_copy = exp_copy(v->sql, e);
/* we cannot rewrite projection with atomic
values from outer joins */
if (is_column(e->type) && exp_is_atom(e) &&
!(is_left(rel->op) || is_full(rel->op))) {
+ sql_exp *e_copy = exp_copy(v->sql, e);
list_append(exps, e_copy);
} else if (e->type == e_column) {
if (has_label(e))
return rel;
- list_append(exps, e_copy);
+ // sql_exp *e_copy = exp_copy(v->sql,
e);
+ list_append(exps, e);
} else {
return rel;
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
