Changeset: d055ce7c4b6d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d055ce7c4b6d
Modified Files:
monetdb5/optimizer/opt_mergetable.c
Branch: Oct2020
Log Message:
don't output mat pack's directly, delays leaves less deadcode behind
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
@@ -492,8 +492,7 @@ mat_apply(MalBlkPtr mb, InstrPtr p, matl
}
}
- InstrPtr *r = NULL;
- r = (InstrPtr*) GDKmalloc(sizeof(InstrPtr)* p->retc);
+ InstrPtr *r = (InstrPtr*) GDKmalloc(sizeof(InstrPtr)* p->retc);
if(!r)
return -1;
for(k=0; k < p->retc; k++) {
@@ -532,13 +531,12 @@ mat_apply(MalBlkPtr mb, InstrPtr p, matl
}
}
for(k=0; k < p->retc; k++) {
- if(mat_add_var(ml, r[k], NULL, getArg(r[k], 0), mat_type(ml->v,
matvar[0]), -1, -1, 1)) {
+ if(mat_add_var(ml, r[k], NULL, getArg(r[k], 0), mat_type(ml->v,
matvar[0]), -1, -1, 0)) {
for(l=0; l < k; l++)
freeInstruction(r[l]);
GDKfree(r);
return -1;
}
- pushInstruction(mb, r[k]);
}
GDKfree(r);
return 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
