MonetDB: default - Packing join optimizers

[Pedro Ferreira]

Changeset: 36ef23e58a9c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=36ef23e58a9c
Modified Files:
        sql/server/rel_optimizer.c
Branch: default
Log Message:

Packing join optimizers


diffs (74 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
@@ -5242,7 +5242,7 @@ rel_push_join_down_union(visitor *v, sql
        return rel;
 }
 
-static sql_rel *
+static inline sql_rel *
 rel_push_join_down_outer(visitor *v, sql_rel *rel)
 {
        if (is_join(rel->op) && !is_outerjoin(rel->op) && !is_single(rel) && 
!list_empty(rel->exps) && !rel_is_ref(rel)) {
@@ -5467,7 +5467,7 @@ rel_uses_exp_outside_subrel(sql_rel *rel
        return 1;
 }
 
-static sql_rel *
+static inline sql_rel *
 rel_join2semijoin(visitor *v, sql_rel *rel)
 {
        if ((is_simple_project(rel->op) || is_groupby(rel->op)) && rel->l) {
@@ -9352,8 +9352,10 @@ rel_merge_table_rewrite(visitor *v, sql_
        return rel;
 }
 
-static bool is_non_trivial_select_applied_to_outer_join(sql_rel *rel) {
-    return is_select(rel->op) && rel->exps && is_outerjoin(((sql_rel*) 
rel->l)->op);
+static inline bool
+is_non_trivial_select_applied_to_outer_join(sql_rel *rel)
+{
+       return is_select(rel->op) && rel->exps && is_outerjoin(((sql_rel*) 
rel->l)->op);
 }
 
 extern list *list_append_before(list *l, node *n, void *data);
@@ -9474,7 +9476,7 @@ out2inner(visitor *v, sql_rel* sel, sql_
     return sel;
 }
 
-static sql_rel *
+static inline sql_rel *
 rel_out2inner(visitor *v, sql_rel *rel) {
 
     if (!is_non_trivial_select_applied_to_outer_join(rel)) {
@@ -9517,6 +9519,15 @@ rel_out2inner(visitor *v, sql_rel *rel) 
     }
 }
 
+static sql_rel *
+rel_optimize_joins(visitor *v, sql_rel *rel)
+{
+       rel = rel_out2inner(v, rel);
+       rel = rel_join2semijoin(v, rel);
+       rel = rel_push_join_down_outer(v, rel);
+       return rel;
+}
+
 static sql_rel*
 exp_skip_output_parts(sql_rel *rel)
 {
@@ -9738,13 +9749,7 @@ optimize_rel(mvc *sql, sql_rel *rel, int
 
        if (gp.cnt[op_join] || gp.cnt[op_left] || gp.cnt[op_right] || 
gp.cnt[op_full] || gp.cnt[op_semi] || gp.cnt[op_anti]) {
                rel = rel_remove_empty_join(&v, rel);
-
-               if ((gp.cnt[op_left] || gp.cnt[op_right] || gp.cnt[op_full]) && 
gp.cnt[op_select])
-                       rel = rel_visitor_topdown(&v, rel, &rel_out2inner);
-               if (gp.cnt[op_join])
-                       rel = rel_visitor_bottomup(&v, rel, &rel_join2semijoin);
-               if ((gp.cnt[op_left] || gp.cnt[op_right] || gp.cnt[op_full]) && 
gp.cnt[op_join])
-                       rel = rel_visitor_bottomup(&v, rel, 
&rel_push_join_down_outer);
+               rel = rel_visitor_bottomup(&v, rel, &rel_optimize_joins);
                if (!gp.cnt[op_update])
                        rel = rel_join_order(&v, rel);
                if (level <= 0 && (gp.cnt[op_join] || gp.cnt[op_semi] || 
gp.cnt[op_anti]))
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list