MonetDB: graph0 - Optimizer: up to rel_rewrite_types

[Dean De Leo]

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

Optimizer: up to rel_rewrite_types


diffs (40 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
@@ -8779,9 +8779,7 @@ 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])
@@ -8793,9 +8791,10 @@ static sql_rel *
        if (gp.cnt[op_project]) 
                rel = rewrite(sql, rel, &rel_project_cse, &changes);
 
-       rel = rewrite(sql, rel, &rel_rewrite_types, &changes); 
+       rel = rewrite(sql, rel, &rel_rewrite_types, &changes); // dummy
 
        if (gp.cnt[op_anti] || gp.cnt[op_semi]) {
+               printf("Optimizer rel_reduce_casts [before]: %s", rel2str1(sql, 
rel));
                /* rewrite semijoin (A, join(A,B)) into semijoin (A,B) */
                rel = rewrite(sql, rel, &rel_rewrite_semijoin, &changes);
                /* push semijoin through join */
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -65,6 +65,11 @@ rel_destroy_(sql_rel *rel)
        } else if (is_modify(rel->op)) {
                if (rel->r)
                        rel_destroy(rel->r);
+       } else if (is_graph(rel->op)){
+               sql_graph* graph_ptr = (sql_graph*) rel;
+               rel_destroy(rel->l);
+               rel_destroy(rel->r);
+               rel_destroy(graph_ptr->edges);
        }
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list