MonetDB: Oct2010 - fixed problem in handling offset, distinct an...

[Niels Nes]

Changeset: a65c9a137a83 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a65c9a137a83
Modified Files:
        sql/src/server/rel_bin.mx
Branch: Oct2010
Log Message:

fixed problem in handling offset, distinct and order by


diffs (21 lines):

diff -r 31204e928423 -r a65c9a137a83 sql/src/server/rel_bin.mx
--- a/sql/src/server/rel_bin.mx Wed Sep 15 14:57:02 2010 +0200
+++ b/sql/src/server/rel_bin.mx Wed Sep 15 14:57:55 2010 +0200
@@ -1105,7 +1105,7 @@
        for (n = s->op1.lval->h; n; n = n->next) {
                stmt *t = n->data;
 
-               list_append(rl, stmt_join(stmt_dup(grp->ext), stmt_dup(t), 
cmp_equal));
+               list_append(rl, stmt_project(stmt_dup(grp->ext), stmt_dup(t)));
        }
 
        if (grp)
@@ -1638,7 +1638,7 @@
        }
        if (need_distinct(rel))
                psub = rel2bin_distinct(psub);
-       if (!topn && rel->r) {
+       if ((!topn || need_distinct(rel)) && rel->r) {
                list *oexps = rel->r;
                stmt *orderby = NULL;
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list