Changeset: 8505385cdc19 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8505385cdc19
Modified Files:
monetdb5/optimizer/opt_mergetable.c
Branch: pushcands
Log Message:
make sure we use the candidates when backprojecting the groupby column
diffs (16 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
@@ -1660,9 +1660,11 @@ mat_group_derive(MalBlkPtr mb, InstrPtr
r1 = addArgument(mb,r1,getArg(q,1));
r2 = addArgument(mb,r2,getArg(q,2)); /* packed cnts */
- r = newInstruction(mb, algebraRef, projectionRef);
+ r = newInstructionArgs(mb, algebraRef,
(cand>=0)?projectionpathRef:projectionRef, 3+(cand>=0)?1:0);
getArg(r, 0) = newTmpVariable(mb, atp);
r = addArgument(mb, r, getArg(q,1));
+ if (cand >= 0)
+ r = addArgument(mb, r, getArg(ml->v[cand].mi,i));
r = addArgument(mb, r, getArg(ml->v[b].mi,i));
if(setPartnr(ml, getArg(ml->v[b].mi,i), getArg(r,0), i)){
freeInstruction(r0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
