MonetDB: pp_hashjoin - removed use of LANG_PY

[Niels Nes via checkin-list]

Changeset: a291d695cc1a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a291d695cc1a
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:

removed use of LANG_PY


diffs (59 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
@@ -1284,10 +1284,6 @@ rel2bin_groupby_pp(backend *be, sql_rel 
                                        restype = newBatType(restype);
                                        setVarType(be->mb, getArg(q, 0), 
restype);
                                }
-                               if (af->func->lang == FUNC_LANG_PY) {
-                                       setVarType(be->mb, getArg(q, 0), 
restype);
-                                       q = pushStr(be->mb, q, af->func->query);
-                               }
 
                                node *osn = sn;
                                if (r) { /* check new ordered aggregation */
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
@@ -422,17 +422,6 @@ rel_groupby_partition_safe(sql_rel *rel)
                        }
                }
        }
-       if (!list_empty(rel->r)) {
-               for(node *n = rel->exps->h; n; n = n->next ) {
-                       sql_exp *e = n->data;
-
-                       if (is_aggr(e->type)) {
-                               sql_subfunc *sf = e->f;
-                               if (sf->func->lang == FUNC_LANG_PY)
-                                       return false;
-                       }
-               }
-       }
        return true;
 }
 
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,7 +112,6 @@ stmt_pp_aggr(backend *be, stmt *op1, stm
                + 2 * avg
                + 2 * sum
                + (LANG_EXT(op->func->lang) != 0)
-               + (op->func->lang == FUNC_LANG_PY)
                + (op1->type != st_list ? 1 : list_length(op1->op4.lval))
                + (grp ? 4 : avg + 1);
 
@@ -144,12 +143,6 @@ 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_PY) {
-               if (!grp) {
-                       setVarType(mb, getArg(q, 0), restype);
-               }
-               q = pushStr(mb, q, op->func->query);
-       }
 
        if (grp && grp != op1)
                q = pushArgument(mb, q, grp->nr);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org