Changeset: 15626bb533cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=15626bb533cc
Modified Files:
monetdb5/scheduler/mut_pack.c
monetdb5/scheduler/mut_select.c
Branch: mutation
Log Message:
Mat pack extensions
diffs (30 lines):
diff --git a/monetdb5/scheduler/mut_pack.c b/monetdb5/scheduler/mut_pack.c
--- a/monetdb5/scheduler/mut_pack.c
+++ b/monetdb5/scheduler/mut_pack.c
@@ -200,6 +200,15 @@ mutationPack(Client cntxt, Mutant m){
modified++;
continue;
}
+ if( getModuleId(p) == matRef && (getFunctionId(p) ==
packRef || getFunctionId(p) == mergepackRef) && getFunctionId(newpack) ==
getFunctionId(p)){
+ DEBUG_MULTICORE
mnstr_printf(cntxt->fdout,"#MUTATIONPACK [MERGE]PACK\n");
+ delArgument(p,pos);
+ for( j = newpack->retc; j < newpack->argc; j++)
+ p = setArgument(mb, p, pos,
getArg(newpack,j));
+ pushInstruction(mb, p);
+ modified++;
+ continue;
+ }
pushInstruction(mb, p);
} else
if ( newpack && packpc == i-1 && getArgPos(p,mvar) < 0){
diff --git a/monetdb5/scheduler/mut_select.c b/monetdb5/scheduler/mut_select.c
--- a/monetdb5/scheduler/mut_select.c
+++ b/monetdb5/scheduler/mut_select.c
@@ -54,6 +54,7 @@ mutationSelect_(MalBlkPtr mb, MalStkPtr
q= newStmt(mb, batRef, partitionRef);
setVarType(mb, getArg(q,0), getArgType(mb, p, p->retc));
+ stk->stk[getArg(q, 0)].vtype = getVarGDKType(mb, getArg(q,0));
b1 = getArg(q,0);
q = pushArgument(mb,q,getArg(p,1));
q = pushInt(mb,q,partitions);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
