MonetDB: Jun2020 - Flag changes only when they happen

[Pedro Ferreira]

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

Flag changes only when they happen


diffs (35 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
@@ -1850,7 +1850,6 @@ rel_simplify_project_fk_join(mvc *sql, s
                        return r;
        }
 
-       (*changes)++;
        /* rewrite, ie remove pkey side if possible */
        le = (sql_exp*)je->l, re = (sql_exp*)je->l;
 
@@ -1858,6 +1857,7 @@ rel_simplify_project_fk_join(mvc *sql, s
        if (is_semantics(je) && has_nil(le) && has_nil(re))
                return r;
 
+       (*changes)++;
        /* if the foreign key column doesn't have NULL values, then return it */
        if (!has_nil(le) || is_full(r->op) || (fk_left && is_left(r->op)) || 
(!fk_left && is_right(r->op)))
                return fk_left ? r->l : r->r;
@@ -1911,7 +1911,6 @@ rel_simplify_count_fk_join(mvc *sql, sql
                r->r = rr;
        }
 
-       (*changes)++;
        /* rewrite, ie remove pkey side if possible */
        le = (sql_exp*)je->l, re = (sql_exp*)je->l;
 
@@ -1919,6 +1918,7 @@ rel_simplify_count_fk_join(mvc *sql, sql
        if (is_semantics(je) && has_nil(le) && has_nil(re))
                return r;
 
+       (*changes)++;
        /* if the foreign key column doesn't have NULL values, then return it */
        if (!has_nil(le) || is_full(r->op) || (fk_left && is_left(r->op)) || 
(!fk_left && is_right(r->op)))
                return fk_left ? r->l : r->r;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list