Was this the problem we discussed yesterday? If so, shouldn't this be on the Feb2013 branch?

On 2013-04-10 11:00, Niels Nes wrote:

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

fixed problem unaligned avg/counts bats.

diffs (28 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 @@ -633,7 +633,7 @@ mat_aggr(MalBlkPtr mb, InstrPtr p, mat_t pushInstruction(mb, u);

/* Filter empty partitions */

• if (getModuleId(p) == aggrRef) {

• if (getModuleId(p) == aggrRef && !isAvg) { s = newInstruction(mb,ASSIGNsymbol); setModuleId(s, algebraRef); setFunctionId(s, selectNotNilRef);

@@ -710,6 +710,15 @@ mat_aggr(MalBlkPtr mb, InstrPtr p, mat_t pushInstruction(mb, w);

r = w;

• /* filter nils */
  

• s = newInstruction(mb,ASSIGNsymbol);
  

• setModuleId(s, algebraRef);
  

• setFunctionId(s, selectNotNilRef);
  

• getArg(s,0) = newTmpVariable(mb, battp);
  

• s = pushArgument(mb, s, getArg(r,0));
  

• pushInstruction(mb, s);
  

• r = s;
  

  }

  s = newInstruction(mb,ASSIGNsymbol);

---

checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list