MonetDB: pp_hashjoin - compilation fixes after merge

[Niels Nes via checkin-list]

Changeset: 4ac1bbecc77b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4ac1bbecc77b
Modified Files:
        sql/backends/monet5/bin_partition_by_slice.c
        sql/backends/monet5/rel_physical.c
        sql/backends/monet5/sql_pp_statement.c
Branch: pp_hashjoin
Log Message:

compilation fixes after merge


diffs (107 lines):

diff --git a/sql/backends/monet5/bin_partition_by_slice.c 
b/sql/backends/monet5/bin_partition_by_slice.c
--- a/sql/backends/monet5/bin_partition_by_slice.c
+++ b/sql/backends/monet5/bin_partition_by_slice.c
@@ -47,11 +47,11 @@ exp_getcard(mvc *sql, sql_rel *rel, sql_
        if ((p = find_prop(e->p, PROP_NUNIQUES)))
                est = (BUN)p->value.dval;
 
-       if (est == BUN_NONE 
+       if (est == BUN_NONE
 #if SIZEOF_BUN == SIZEOF_LNG
                || (ulng) est > (ulng) GDK_lng_max
 #endif
-       ) 
+       )
                cnt = 85000000;
        else
                cnt = (BUN) est;
@@ -86,7 +86,7 @@ rel_groupby_2_phases(mvc *sql, sql_rel *
        lng card = 1, cnt;
        bool global = list_empty(rel->r);
 
-       if (est == BUN_NONE 
+       if (est == BUN_NONE
 #if SIZEOF_BUN == SIZEOF_LNG
                || (ulng) est > (ulng) GDK_lng_max
 #endif
@@ -214,7 +214,7 @@ rel_groupby_prepare_pp(list **aggrresult
        list *shared = NULL;
        BUN est = get_rel_count(rel->l);
        lng estimate, card = 1;
-       if (est == BUN_NONE 
+       if (est == BUN_NONE
 #if SIZEOF_BUN == SIZEOF_LNG
                || (ulng) est > (ulng) GDK_lng_max
 #endif
@@ -394,7 +394,7 @@ rel_groupby_prepare_pp(list **aggrresult
 #if SIZEOF_BUN == SIZEOF_LNG
                                                                || (ulng) est > 
(ulng) GDK_lng_max
 #endif
-                                                       ) 
+                                                       )
                                                                estimate = 
85000000;
                                                        else
                                                                estimate = 
(BUN) est;
@@ -1284,16 +1284,8 @@ rel2bin_groupby_pp(backend *be, sql_rel 
                                        restype = newBatType(restype);
                                        setVarType(be->mb, getArg(q, 0), 
restype);
                                }
-                               if (af->func->lang == FUNC_LANG_R ||
-                                       af->func->lang >= FUNC_LANG_PY ||
-                                       af->func->lang == FUNC_LANG_C ||
-                                       af->func->lang == FUNC_LANG_CPP) {
+                               if (af->func->lang == FUNC_LANG_PY) {
                                        setVarType(be->mb, getArg(q, 0), 
restype);
-                                       if (af->func->lang == FUNC_LANG_C) {
-                                               q = pushBit(be->mb, q, 0);
-                                       } else if (af->func->lang == 
FUNC_LANG_CPP) {
-                                               q = pushBit(be->mb, q, 1);
-                                       }
                                        q = pushStr(be->mb, q, af->func->query);
                                }
 
diff --git a/sql/backends/monet5/rel_physical.c 
b/sql/backends/monet5/rel_physical.c
--- a/sql/backends/monet5/rel_physical.c
+++ b/sql/backends/monet5/rel_physical.c
@@ -428,7 +428,7 @@ rel_groupby_partition_safe(sql_rel *rel)
 
                        if (is_aggr(e->type)) {
                                sql_subfunc *sf = e->f;
-                               if (sf->func->lang == FUNC_LANG_R || 
sf->func->lang == FUNC_LANG_PY)
+                               if (sf->func->lang == FUNC_LANG_PY)
                                        return false;
                        }
                }
diff --git a/sql/backends/monet5/sql_pp_statement.c 
b/sql/backends/monet5/sql_pp_statement.c
--- a/sql/backends/monet5/sql_pp_statement.c
+++ b/sql/backends/monet5/sql_pp_statement.c
@@ -112,8 +112,7 @@ stmt_pp_aggr(backend *be, stmt *op1, stm
                + 2 * avg
                + 2 * sum
                + (LANG_EXT(op->func->lang) != 0)
-               + 2 * (op->func->lang == FUNC_LANG_C || op->func->lang == 
FUNC_LANG_CPP)
-               + (op->func->lang == FUNC_LANG_PY || op->func->lang == 
FUNC_LANG_R)
+               + (op->func->lang == FUNC_LANG_PY)
                + (op1->type != st_list ? 1 : list_length(op1->op4.lval))
                + (grp ? 4 : avg + 1);
 
@@ -145,18 +144,10 @@ stmt_pp_aggr(backend *be, stmt *op1, stm
 
        if (LANG_EXT(op->func->lang))
                q = pushPtr(mb, q, op->func);
-       if (op->func->lang == FUNC_LANG_R ||
-               op->func->lang >= FUNC_LANG_PY ||
-               op->func->lang == FUNC_LANG_C ||
-               op->func->lang == FUNC_LANG_CPP) {
+       if (op->func->lang == FUNC_LANG_PY) {
                if (!grp) {
                        setVarType(mb, getArg(q, 0), restype);
                }
-               if (op->func->lang == FUNC_LANG_C) {
-                       q = pushBit(mb, q, 0);
-               } else if (op->func->lang == FUNC_LANG_CPP) {
-                       q = pushBit(mb, q, 1);
-               }
                q = pushStr(mb, q, op->func->query);
        }
 
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org