Changeset: f66785320b00 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f66785320b00
Modified Files:
sql/server/rel_unnest.c
Branch: default
Log Message:
Call rel_remove_empty_select if rewrite_simplify did change something
diffs (14 lines):
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
@@ -2662,7 +2662,10 @@ rel_unnest(mvc *sql, sql_rel *rel)
rel = rel_visitor_bottomup(sql, rel, &rewrite_join2semi, &changes);
/* where possible convert anyequal functions into marks */
rel = rel_visitor_bottomup(sql, rel, &rewrite_compare_exp, &changes);
/* only allow for e_cmp in selects and handling */
rel = rel_visitor_bottomup(sql, rel, &rewrite_remove_xp_project,
&changes); /* remove crossproducts with project ( project [ atom ] ) [ etc
] */
+ changes = 0;
rel = rel_visitor_bottomup(sql, rel, &rewrite_simplify, &changes);
/* as expressions got merged before, lets try to simplify again */
+ if (changes > 0)
+ rel = rel_visitor_bottomup(sql, rel, &rel_remove_empty_select,
&changes);
rel = _rel_unnest(sql, rel);
rel = rel_visitor_bottomup(sql, rel, &rewrite_fix_count, &changes);
/* fix count inside a left join (adds a project (if (cnt IS null) then (0) else
(cnt)) */
rel = rel_visitor_bottomup(sql, rel, &rewrite_remove_xp, &changes);
/* remove crossproducts with project [ atom ] */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list