Changeset: 6c310c9c17af for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c310c9c17af
Modified Files:
monetdb5/optimizer/opt_mergetable.c
Branch: default
Log Message:
Use addArgument in the situation where you have constructed
a MAL instruction not part of a MAL block
diffs (128 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
@@ -331,7 +331,7 @@ mat_delta(matlist_t *ml, MalBlkPtr mb, I
freeInstruction(r);
return NULL;
}
- r = pushArgument(mb, r, getArg(q, 0));
+ r = addArgument(mb, r, getArg(q, 0));
nr++;
break;
@@ -364,7 +364,7 @@ mat_delta(matlist_t *ml, MalBlkPtr mb, I
freeInstruction(r);
return NULL;
}
- r = pushArgument(mb, r, getArg(q, 0));
+ r = addArgument(mb, r, getArg(q, 0));
}
if (evar == 1 && e >= 0 && mat[e].type == mat_slc &&
is_projectdelta) {
InstrPtr q = newInstruction(mb, algebraRef,
projectionRef);
@@ -456,7 +456,7 @@ mat_apply1(MalBlkPtr mb, InstrPtr p, mat
freeInstruction(r);
return NULL;
}
- r = pushArgument(mb, r, getArg(q, 0));
+ r = addArgument(mb, r, getArg(q, 0));
}
return r;
}
@@ -506,7 +506,7 @@ mat_apply2(matlist_t *ml, MalBlkPtr mb,
GDKfree(r);
return -1;
}
- r[l] = pushArgument(mb, r[l], getArg(q, l));
+ r[l] = addArgument(mb, r[l], getArg(q, l));
}
}
@@ -563,7 +563,7 @@ mat_apply3(MalBlkPtr mb, InstrPtr p, mat
GDKfree(r);
return -1;
}
- r[l] = pushArgument(mb, r[l], getArg(q, l));
+ r[l] = addArgument(mb, r[l], getArg(q, l));
}
}
for(k=0; k < p->retc; k++) {
@@ -637,7 +637,7 @@ mat_setop(MalBlkPtr mb, InstrPtr p, matl
}
pushInstruction(mb,q);
- r = pushArgument(mb,r,getArg(q,0));
+ r = addArgument(mb,r,getArg(q,0));
nr++;
}
} else {
@@ -657,7 +657,7 @@ mat_setop(MalBlkPtr mb, InstrPtr p, matl
freeInstruction(r);
return -1;
}
- r = pushArgument(mb, r, getArg(q,0));
+ r = addArgument(mb, r, getArg(q,0));
}
}
@@ -701,7 +701,7 @@ mat_projection(MalBlkPtr mb, InstrPtr p,
freeInstruction(r);
return -1;
}
- r = pushArgument(mb,r,getArg(q,0));
+ r = addArgument(mb,r,getArg(q,0));
nr++;
break;
@@ -728,7 +728,7 @@ mat_projection(MalBlkPtr mb, InstrPtr p,
freeInstruction(r);
return -1;
}
- r = pushArgument(mb, r, getArg(q,0));
+ r = addArgument(mb, r, getArg(q,0));
}
}
@@ -781,8 +781,8 @@ mat_join2(MalBlkPtr mb, InstrPtr p, matl
}
/* add result to mat */
- l = pushArgument(mb,l,getArg(q,0));
- r = pushArgument(mb,r,getArg(q,1));
+ l = addArgument(mb,l,getArg(q,0));
+ r = addArgument(mb,r,getArg(q,1));
nr++;
}
}
@@ -813,8 +813,8 @@ mat_join2(MalBlkPtr mb, InstrPtr p, matl
}
/* add result to mat */
- l = pushArgument(mb, l, getArg(q,0));
- r = pushArgument(mb, r, getArg(q,1));
+ l = addArgument(mb, l, getArg(q,0));
+ r = addArgument(mb, r, getArg(q,1));
}
}
return mat_add(ml, l, mat_none, getFunctionId(p)) || mat_add(ml, r,
mat_none, getFunctionId(p));
@@ -929,8 +929,8 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb,
}
/* add result to mat */
- l = pushArgument(mb,l,getArg(q,0));
- r = pushArgument(mb,r,getArg(q,1));
+ l = addArgument(mb,l,getArg(q,0));
+ r = addArgument(mb,r,getArg(q,1));
nr++;
}
}
@@ -966,8 +966,8 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb,
pushInstruction(mb,q);
/* add result to mat */
- l = pushArgument(mb, l, getArg(q,0));
- r = pushArgument(mb, r, getArg(q,1));
+ l = addArgument(mb, l, getArg(q,0));
+ r = addArgument(mb, r, getArg(q,1));
}
}
res = mat_add(ml, l, mat_none, getFunctionId(p)) || mat_add(ml, r,
mat_none, getFunctionId(p));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
