MonetDB: default - set type of container bat right

[Fabian Groffen]

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

set type of container bat right


diffs (52 lines):

diff -r efe34fc61c06 -r 966232d7c476 MonetDB5/src/optimizer/opt_mapreduce.mx
--- a/MonetDB5/src/optimizer/opt_mapreduce.mx   Wed Jun 09 11:41:59 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mapreduce.mx   Wed Jun 09 12:54:09 2010 +0200
@@ -194,11 +194,12 @@
                if (isaBatType(lcol->type)) {
                        p = pushType(reduce, p, getHeadType(lcol->type));
                        p = pushType(reduce, p, getTailType(lcol->type));
+                       setArgType(reduce, p, 0, lcol->type);
                } else {
                        p = pushNil(reduce, p, TYPE_void);
                        p = pushType(reduce, p, lcol->type);
+                       setArgType(reduce, p, 0, newBatType(TYPE_void, 
lcol->type));
                }
-               setArgType(reduce, p, 0, lcol->type);
                lcol->mapbat = getArg(p, 0);
 
                /* we need to declare the variables that we will use with put,
@@ -275,11 +276,20 @@
                        p = pushArgument(reduce, p, gets[(i * retc) + j]);
                        q = getArg(p, 0);
                }
-               /* markH all result bats such that further operations don't get
-                * confused by possible duplicate ids */
-               p = newFcnCall(reduce, algebraRef, markHRef);
-               p = pushArgument(reduce, p, q);
-               getArg(p, 0) = lcol->mapbat;
+
+               if (isaBatType(lcol->type)) {
+                       /* markH all result bats such that further operations 
don't get
+                        * confused by possible duplicate ids */
+                       p = newFcnCall(reduce, algebraRef, markHRef);
+                       p = pushArgument(reduce, p, q);
+                       getArg(p, 0) = lcol->mapbat;
+               } else {
+                       lcol->mapbat = getArg(p, 0);
+               }
+
+               p = newAssignment(reduce);
+               p = pushArgument(reduce, p, lcol->mapbat);
+               getArg(p, 0) = lcol->reduceid;
        }
 
 #if defined(_DEBUG_OPT_MAPREDUCE) && _DEBUG_OPT_MAPREDUCE == 0
@@ -711,6 +721,8 @@
                                        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
                                        /* propagate type change */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list