MonetDB: Jul2015 - removed old hack from merge table optimizer, ...

[Niels Nes]

Changeset: 02b5c58d1717 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02b5c58d1717
Modified Files:
        monetdb5/optimizer/opt_mergetable.c
Branch: Jul2015
Log Message:

removed old hack from merge table optimizer, ie handling group by/group by 
combinations.
(fixing old bug 3317, which broke after recent fixes)


diffs (20 lines):

diff --git a/monetdb5/optimizer/opt_mergetable.c 
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -831,7 +831,6 @@ static void
 mat_group_project(MalBlkPtr mb, InstrPtr p, matlist_t *ml, int e, int a)
 {
        int tp = getArgType(mb,p,0), k;
-       int tail = getColumnType(tp);
        InstrPtr ai1 = newInstruction(mb, ASSIGNsymbol), r;
        mat_t *mat = ml->v;
 
@@ -858,8 +857,6 @@ mat_group_project(MalBlkPtr mb, InstrPtr
        getArg(r,1) = mat[e].mv;
        getArg(r,2) = getArg(ai1,0);
        pushInstruction(mb,r);
-       if (tail == TYPE_oid)
-               mat_add_var(ml, ai1, r, getArg(r, 0), mat_ext,  -1, -1);
 }
 
 /* Per partition aggregates are merged and aggregated together. For 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list