Changeset: 48c4879cc71d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48c4879cc71d Modified Files: sql/src/backends/monet5/sql.mx sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.sql Branch: default Log Message:
allow reversed sorted columns in sql_rank diffs (35 lines): diff -r abb6e1343df0 -r 48c4879cc71d sql/src/backends/monet5/sql.mx --- a/sql/src/backends/monet5/sql.mx Fri May 07 14:35:32 2010 +0200 +++ b/sql/src/backends/monet5/sql.mx Fri May 07 15:40:27 2010 +0200 @@ -4796,8 +4796,9 @@ if( (b = BATdescriptor(*bid)) == NULL ) throw(SQL, "s...@1rank", "Cannot access descriptor"); - if (BATtordered(b) != GDK_SORTED) + if (!(BATtordered(b) & GDK_SORTED) && !(BATtordered(b) & GDK_SORTED_REV)) throw(SQL, "s...@1rank", "bat not sorted"); + bi = bat_iterator(b); cmp = BATatoms[b->ttype].atomCmp; cur = BUNtail(bi, BUNfirst(b)); diff -r abb6e1343df0 -r 48c4879cc71d sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.sql --- a/sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.sql Fri May 07 14:35:32 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.sql Fri May 07 15:40:27 2010 +0200 @@ -12,9 +12,17 @@ insert into score_table values('bar','history',75); -- this causes an assertion failure: +plan select s_name, sum(score) as totalscore, rank() over (order by sum(score) desc) -- cannot use alias 'totalscore' here from score_table group by s_name; + +select +s_name, +sum(score) as totalscore, +rank() over (order by sum(score) desc) -- cannot use alias 'totalscore' here +from score_table +group by s_name; _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list