Changeset: 2ca640c8df93 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2ca640c8df93
Modified Files:
        sql/server/rel_optimize_proj.c
Branch: pp_hashjoin
Log Message:

properly check if oahash is enabled


diffs (23 lines):

diff --git a/sql/server/rel_optimize_proj.c b/sql/server/rel_optimize_proj.c
--- a/sql/server/rel_optimize_proj.c
+++ b/sql/server/rel_optimize_proj.c
@@ -3347,7 +3347,8 @@ rel_project_select_exp(visitor *v, sql_r
 static sql_rel *
 rel_optimize_projections_(visitor *v, sql_rel *rel)
 {
-       ATOMIC_TYPE oahash_enabled = (1U<<19);
+       ATOMIC_TYPE oahash_mask = (1U<<19);
+       bool oahash_enabled = (GDKdebug & oahash_mask);
        rel = rel_project_cse(v, rel);
        rel = rel_project_select_exp(v, rel);
        rel = rel_use_equality_exps(v, rel);
@@ -3523,7 +3524,8 @@ rel_merge_unions(visitor *v, sql_rel *re
 static inline sql_rel *
 rel_push_join_down_munion(visitor *v, sql_rel *rel)
 {
-       ATOMIC_TYPE oahash_enabled = (1U<<19);
+       ATOMIC_TYPE oahash_mask = (1U<<19);
+       bool oahash_enabled = (GDKdebug & oahash_mask);
        if (!oahash_enabled && ((is_join(rel->op) && !is_outerjoin(rel->op) && 
!is_single(rel)) || is_semi(rel->op))) {
                sql_rel *l = rel->l, *r = rel->r, *ol = l, *or = r;
                list *exps = rel->exps, *attr = rel->attr;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to