Changeset: 7728f6493cdd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7728f6493cdd
Modified Files:
        MonetDB5/src/optimizer/opt_mapreduce.mx
Branch: default
Log Message:

can't reference what we just freed


diffs (34 lines):

diff -r 4c5c629e6493 -r 7728f6493cdd MonetDB5/src/optimizer/opt_mapreduce.mx
--- a/MonetDB5/src/optimizer/opt_mapreduce.mx   Wed Jun 09 11:18:23 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mapreduce.mx   Wed Jun 09 11:27:02 2010 +0200
@@ -552,6 +552,11 @@
                                                        /* this is a column 
reference, keep it */
                                                        if (lastcol == NULL) {
                                                                col = lastcol = 
alloca(sizeof(mapcol));
+                                                               lastcol->mapid 
= getArg(p, 0);
+                                                               
lastcol->reduceid = getArg(oreduce[i], 0);
+                                                               lastcol->type = 
getArgType(map, p, 0);
+                                                               lastcol->mapbat 
= -1;
+                                                               lastcol->next = 
NULL;
                                                                /* this is the 
first one, leave a marker */
                                                                
freeInstruction(oreduce[i]);
                                                                /* FIXME: 
should leave some symbol */
@@ -561,13 +566,13 @@
                                                        } else {
                                                                lastcol = 
lastcol->next =
                                                                        
alloca(sizeof(mapcol));
+                                                               lastcol->mapid 
= getArg(p, 0);
+                                                               
lastcol->reduceid = getArg(oreduce[i], 0);
+                                                               lastcol->type = 
getArgType(map, p, 0);
+                                                               lastcol->mapbat 
= -1;
+                                                               lastcol->next = 
NULL;
                                                                copy = SINGLE;
                                                        }
-                                                       lastcol->mapid = 
getArg(p, 0);
-                                                       lastcol->reduceid = 
getArg(oreduce[i], 0);
-                                                       lastcol->type = 
getArgType(map, p, 0);
-                                                       lastcol->mapbat = -1;
-                                                       lastcol->next = NULL;
                                                        newComment(map, "= sql 
column bat");
 
                                                        @:dealWithAVG@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to