MonetDB: Jan2014 - fixed code, shouldn't be assert but check

[Niels Nes]

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

fixed code, shouldn't be assert but check


diffs (29 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
@@ -5621,23 +5621,17 @@ rel_rewrite_semijoin(int *changes, mvc *
                                        return rel;
 
                                if (exp_find_column(rl, ne->l, -2) == cl) {
-#ifndef NDEBUG
                                        sql_exp *e = (or != r)?rel_find_exp(or, 
re):re;
                                        int equal = exp_match_exp(ne->r, e);
 
-                                       assert(equal);
-#endif
-                                       if (anti && re != ne->r)
+                                       if (anti && !equal)
                                                return rel;
                                        re = ne->r;
                                } else if (exp_find_column(rl, ne->r, -2) == 
cl) {
-#ifndef NDEBUG
                                        sql_exp *e = (or != r)?rel_find_exp(or, 
re):re;
                                        int equal = exp_match_exp(ne->l, e);
 
-                                       assert(equal);
-#endif
-                                       if (anti && re != ne->l)
+                                       if (anti && !equal)
                                                return rel;
                                        re = ne->l;
                                } else
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list