Changeset: ad28781a31b5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad28781a31b5
Modified Files:
sql/backends/monet5/sql_gencode.c
sql/server/rel_optimizer.c
Branch: Dec2016
Log Message:
fix bug 6245, ie properly handle outer-join in apply rewriter
diffs (24 lines):
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -474,7 +474,7 @@ static int
const char *nme =
(op->op3)?op->op3->op4.aval->data.val.sval:op->cname;
char buf[64];
- if (op->op3)
+ if (nme[0] != 'A')
snprintf(buf,64,"A%s",nme);
else
snprintf(buf,64,"%s",nme);
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
@@ -8358,7 +8358,7 @@ rel_apply_rewrite(int *changes, mvc *sql
return l;
}
}
- if (rel->flag == APPLY_LOJ && r->op == op_select) {
+ if (rel->flag == APPLY_LOJ && (r->op == op_select || is_join(r->op))) {
sql_rel *nr, *ns;
nr = rel_project(sql->sa, rel_dup(r),
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
