MonetDB: default - get typing right for reused vars

[Fabian Groffen]

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

get typing right for reused vars


diffs (25 lines):

diff -r 966232d7c476 -r 98310eaede6e MonetDB5/src/optimizer/opt_mapreduce.mx
--- a/MonetDB5/src/optimizer/opt_mapreduce.mx   Wed Jun 09 12:54:09 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mapreduce.mx   Wed Jun 09 13:11:01 2010 +0200
@@ -285,11 +285,13 @@
                        getArg(p, 0) = lcol->mapbat;
                } else {
                        lcol->mapbat = getArg(p, 0);
+                       lcol->type = newBatType(TYPE_void, lcol->type);
                }
 
                p = newAssignment(reduce);
                p = pushArgument(reduce, p, lcol->mapbat);
                getArg(p, 0) = lcol->reduceid;
+               setArgType(reduce, p, 0, lcol->type);
        }
 
 #if defined(_DEBUG_OPT_MAPREDUCE) && _DEBUG_OPT_MAPREDUCE == 0
@@ -721,7 +723,6 @@
                                        newComment(map, "COUNT/SUM");
                                        pushInstruction(map, omap[i]);
                                        lastcol->mapid = getArg(omap[i], 0);
-                                       lastcol->reduceid = getArg(p, 0);
                                        lastcol->type = getArgType(map, p, 0);
 
 #if 0
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list