MonetDB: graph0 - QRW: checked up to rel_project_reduce_casts

[Dean De Leo]

Changeset: 6e25dde32c0c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e25dde32c0c
Modified Files:
        sql/server/rel_exp.c
        sql/server/rel_optimizer.c
Branch: graph0
Log Message:

QRW: checked up to rel_project_reduce_casts


diffs (54 lines):

diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -983,6 +983,8 @@ exp_match_exp( sql_exp *e1, sql_exp *e2)
                        if (e1->l && e2->l && !atom_cmp(e1->l, e2->l))
                                return 1;
                        break;
+               case e_graph:
+                       assert(0 && "Not implemented yet");
                default:
                        break;
                }
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
@@ -5250,7 +5250,7 @@ exp_use_consts(mvc *sql, sql_exp *e, lis
        case e_psm:
                return e;
        case e_graph:
-               assert(0 && "Not implemented yet");
+               assert(0 && "Invalid code path from the QRW rel_remove_join. It 
should not affect graph expressions");
        }
        return NULL;
 }
@@ -6722,7 +6722,7 @@ split_exp(mvc *sql, sql_exp *e, sql_rel 
        case e_atom:
                return e;
        case e_graph:
-               assert(0 && "Not implemented yet");
+               assert(0 && "Invalid expression of type graph. It should not 
appear here.");
        }
        return e;
 }
@@ -8756,10 +8756,8 @@ static sql_rel *
                }
        }
        /* push (simple renaming) projections up */
-       printf("Optimizer rel_push_project_up [before]: %s", rel2str1(sql, 
rel));
        if (gp.cnt[op_project]) 
                rel = rewrite(sql, rel, &rel_push_project_up, &changes); 
-       printf("Optimizer rel_push_project_up [after]: %s", rel2str1(sql, rel));
        if (level <= 0 && (gp.cnt[op_project] || gp.cnt[op_groupby])) 
                rel = rel_split_project(&changes, sql, rel, 1);
 
@@ -8781,7 +8779,9 @@ static sql_rel *
            gp.cnt[op_select]) {
                rel = rewrite(sql, rel, &rel_find_range, &changes);
                rel = rel_project_reduce_casts(&changes, sql, rel);
+               printf("Optimizer rel_reduce_casts [before]: %s", rel2str1(sql, 
rel));
                rel = rewrite(sql, rel, &rel_reduce_casts, &changes);
+               printf("Optimizer rel_reduce_casts [after]: %s", rel2str1(sql, 
rel));
        }
 
        if (gp.cnt[op_union])
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list