MonetDB: ordered-set-aggregates - set the groupedfirstnRef properly

[Niels Nes via checkin-list]

Changeset: 778fe9447bb2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/778fe9447bb2
Modified Files:
        monetdb5/mal/mal_namespace.c
        monetdb5/optimizer/opt_mitosis.c
Branch: ordered-set-aggregates
Log Message:

set the groupedfirstnRef properly
disable mitosis on groupedfirstn usage


diffs (32 lines):

diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/mal_namespace.c
--- a/monetdb5/mal/mal_namespace.c
+++ b/monetdb5/mal/mal_namespace.c
@@ -463,6 +463,7 @@ initNamespace(void)
        fixName(grant_rolesRef);
        fixName(groupbyRef);
        fixName(groupdoneRef);
+       fixName(groupedfirstnRef);
        fixName(groupRef);
        fixName(growRef);
        fixName(hgeRef);
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -67,13 +67,15 @@ OPTmitosisImplementation(Client cntxt, M
                nr_aggrs += (p->argc > 2 && getModuleId(p) == aggrRef);
                nr_maps += (isMapOp(p));
 
-               if (p->argc > 2 && getModuleId(p) == aggrRef
+               if ((getModuleId(p) == algebraRef &&
+                   getFunctionId(p) == groupedfirstnRef) ||
+                   (p->argc > 2 && getModuleId(p) == aggrRef
                        && getFunctionId(p) != subcountRef && getFunctionId(p) 
!= subminRef
                        && getFunctionId(p) != submaxRef && getFunctionId(p) != 
subavgRef
                        && getFunctionId(p) != subsumRef && getFunctionId(p) != 
subprodRef
                        && getFunctionId(p) != countRef && getFunctionId(p) != 
minRef
                        && getFunctionId(p) != maxRef && getFunctionId(p) != 
avgRef
-                       && getFunctionId(p) != sumRef && getFunctionId(p) != 
prodRef) {
+                       && getFunctionId(p) != sumRef && getFunctionId(p) != 
prodRef)) {
                        pieces = 0;
                        goto bailout;
                }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org