Changeset: af46093f63e2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/af46093f63e2
Modified Files:
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statement.c
Branch: default
Log Message:
Add candidate list check at stmt_unop too. The TODO at exp2bin_coalesce is now
done
diffs (25 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1028,7 +1028,7 @@ exp2bin_coalesce(backend *be, sql_exp *f
if (en->next) {
sql_subfunc *a = sql_bind_func(be->mvc,
"sys", "isnotnull", tail_type(es), NULL, F_FUNC);
- ncond = stmt_unop(be, es, NULL, a);
/*TODO sql/test/coalesce failing for passing 'nsel' here */
+ ncond = stmt_unop(be, es, NULL, a);
if (ncond->nrcols == 0) {
stmt *l =
bin_find_smallest_column(be, left);
if (nsel && l)
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -3257,7 +3257,8 @@ stmt_unop(backend *be, stmt *op1, stmt *
list *ops = sa_list(be->mvc->sa);
list_append(ops, op1);
stmt *r = stmt_Nop(be, stmt_list(be, ops), sel, op);
- r->cand = op1->cand;
+ if (!r->cand)
+ r->cand = op1->cand;
return r;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
