Changeset: ea244b45d593 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ea244b45d593
Modified Files:
Branch: default
Log Message:
merge in opt_mapreduce fixes
diffs (29 lines):
diff -r 6b3a60a20d94 -r ea244b45d593 MonetDB5/src/optimizer/opt_mapreduce.mx
--- a/MonetDB5/src/optimizer/opt_mapreduce.mx Fri May 21 09:51:08 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mapreduce.mx Fri May 21 10:48:32 2010 +0200
@@ -458,7 +458,7 @@
* sql.bind patterns (for columns) are possibly scattered over the
* full plan. We need them all first to determine the signature and
* return correctly. */
- copy = FREE;
+ copy = FREE; /* free original copied signature */
mrcluster[0] = '\0';
for (i = 0; i < limit; i++) { /* phase 1 */
p = old[i];
@@ -555,6 +555,7 @@
switch (copy) {
case FREE:
freeInstruction(p);
+ old[i] = NULL;
break;
case LEAVE:
/* make GCC happy */
@@ -596,7 +597,7 @@
* calling signature of the map program */
getArg(sig, 0) = -1; /* get rid of default retval */
for (lastcol = col; lastcol != NULL; lastcol =
lastcol->next)
- sig = pushReturn(mc, sig, lastcol->val1);
+ mc->stmt[0] = sig = pushReturn(mc, sig,
lastcol->val1);
MRdistributework(cntxt, mb, col, sig, mrcluster);
newComment(mb, "} map");
/* bogus instruction to be able to set to NOOP */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
