MonetDB: default - fix select ... limit X reduce program

[Fabian Groffen]

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

fix select ... limit X reduce program


diffs (26 lines):

diff -r 58ec07478ecd -r 33cf6e81f6af MonetDB5/src/optimizer/opt_mapreduce.mx
--- a/MonetDB5/src/optimizer/opt_mapreduce.mx   Wed Jun 09 13:19:43 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mapreduce.mx   Wed Jun 09 13:51:27 2010 +0200
@@ -670,7 +670,7 @@
                                        newComment(map, "ORDER BY [DESC] or 
LIMIT/OFFSET");
                                        /* fix return */
                                        lastcol->mapid = getArg(omap[i], 0);
-                                       lastcol->reduceid = getArg(p, 0);
+                                       lastcol->type = getArgType(map, p, 0);
                                        break;
                                }
                        }
@@ -779,10 +779,12 @@
                switch (copy) {
                        case STICK:
                                trackstack_push(&tracker, i);
-//                             pushInstruction(reduce, p);
                        break;
                        case SINGLE_DUP:
                                copy = STICK;
+                               pushInstruction(map, omap[i]);
+                               trackstack_push(&tracker, i);
+                       break;
                        case DUP:
                                pushInstruction(map, omap[i]);
                                pushInstruction(reduce, p);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list