Changeset: 8c0b7600adeb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c0b7600adeb
Modified Files:
sql/server/rel_optimizer.c
Branch: Oct2020
Log Message:
Fixing ValidateSystemCatalogTables test crash on default, check if relation is
a projection before renaming exps
diffs (21 lines):
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
@@ -9538,6 +9538,8 @@ rel_remove_union_partitions(visitor *v,
return rel;
if (exp_is_zero_rows(v->sql, rel->l, NULL)) {
sql_rel *r = rel->r;
+ if (!is_project(r->op))
+ r = rel_project(v->sql->sa, r, rel_projections(v->sql,
r, NULL, 1, 1));
rel_rename_exps(v->sql, rel->exps, r->exps);
rel->r = NULL;
rel_destroy(rel);
@@ -9546,6 +9548,8 @@ rel_remove_union_partitions(visitor *v,
}
if (exp_is_zero_rows(v->sql, rel->r, NULL)) {
sql_rel *l = rel->l;
+ if (!is_project(l->op))
+ l = rel_project(v->sql->sa, l, rel_projections(v->sql,
l, NULL, 1, 1));
rel_rename_exps(v->sql, rel->exps, l->exps);
rel->l = NULL;
rel_destroy(rel);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
