MonetDB: default - optimise away a needless assignment instructi...

[Fabian Groffen]

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

optimise away a needless assignment instruction in case the returned type by 
the map-nodes is a bat


diffs (25 lines):

diff -r 33cf6e81f6af -r c4d59d20607f MonetDB5/src/optimizer/opt_mapreduce.mx
--- a/MonetDB5/src/optimizer/opt_mapreduce.mx   Wed Jun 09 13:51:27 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mapreduce.mx   Wed Jun 09 13:56:30 2010 +0200
@@ -282,16 +282,15 @@
                         * confused by possible duplicate ids */
                        p = newFcnCall(reduce, algebraRef, markHRef);
                        p = pushArgument(reduce, p, q);
-                       getArg(p, 0) = lcol->mapbat;
+                       getArg(p, 0) = lcol->reduceid;
                } 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);
                }
-
-               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
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list