Changeset: e0f5d1f02b68 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e0f5d1f02b68
Modified Files:
        sql/backends/monet5/sql_statement.c
Branch: default
Log Message:

'grp' is more general when checking for single value aggregates


diffs (19 lines):

diff --git a/sql/backends/monet5/sql_statement.c 
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -3802,13 +3802,13 @@ stmt_aggr(backend *be, stmt *op1, stmt *
                + (op1->type != st_list ? 1 : list_length(op1->op4.lval))
                + (grp ? 4 : avg + 1);
 
-       if (ext) {
+       if (grp) {
                char *aggrF = SA_NEW_ARRAY(be->mvc->sa, char, strlen(aggrfunc) 
+ 4);
                if (!aggrF)
                        return NULL;
                stpcpy(stpcpy(aggrF, "sub"), aggrfunc);
                aggrfunc = aggrF;
-               if (grp && (grp->nr < 0 || ext->nr < 0))
+               if ((grp && grp->nr < 0) || (ext && ext->nr < 0))
                        return NULL;
 
                q = newStmtArgs(mb, mod, aggrfunc, argc);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to