Changeset: 438489fc0ec4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=438489fc0ec4 Modified Files: sql/test/analytics/Tests/analytics09.sql sql/test/analytics/Tests/analytics09.stable.err sql/test/analytics/Tests/analytics09.stable.out Branch: default Log Message:
Approve output diffs (144 lines): diff --git a/sql/test/analytics/Tests/analytics09.sql b/sql/test/analytics/Tests/analytics09.sql --- a/sql/test/analytics/Tests/analytics09.sql +++ b/sql/test/analytics/Tests/analytics09.sql @@ -43,7 +43,7 @@ select cast(sum(aa) * count(aa) / avg(aa select avg(sum(aa)) over (), avg(sum(aa)) over (rows unbounded preceding), cast(sum(aa) * count(aa) / avg(aa) over (rows between current row and unbounded following) as bigint), - avg(sum(aa)) over (range unbounded preceding) from analytics group by aa; --TODO support multiple aggregations within the same projection + avg(sum(aa)) over (range unbounded preceding) from analytics group by aa; select cast(sum(aa) * count(aa) over () as bigint), cast(sum(aa) over () as bigint) from analytics group by aa; @@ -52,15 +52,15 @@ select cast(sum(sum(aa)) over () as bigi cast(sum(aa) * count(count(aa)) over () as bigint) from analytics group by aa; select count(aa) over (), - avg(aa) over () * count(aa) from analytics group by aa; --TODO + avg(aa) over () * count(aa) from analytics group by aa; select cast(sum(aa) over () as bigint), cast(sum(aa) over () as bigint), - cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; --TODO + cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; select 21 - avg(sum(aa)) over (), avg(45 * count(aa) + sum(aa)) over (), - cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; --TODO + cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; select avg(sum(aa)) over (partition by bb) from analytics group by bb; diff --git a/sql/test/analytics/Tests/analytics09.stable.err b/sql/test/analytics/Tests/analytics09.stable.err --- a/sql/test/analytics/Tests/analytics09.stable.err +++ b/sql/test/analytics/Tests/analytics09.stable.err @@ -28,31 +28,7 @@ stderr of test 'analytics09` in director # 13:13:17 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1389" "--port=37694" # 13:13:17 > -MAPI = (monetdb) /var/tmp/mtest-7775/.s.monetdb.35563 -QUERY = select avg(sum(aa)) over (), - avg(sum(aa)) over (rows unbounded preceding), - cast(sum(aa) * count(aa) / avg(aa) over (rows between current row and unbounded following) as bigint), - avg(sum(aa)) over (range unbounded preceding) from analytics group by aa; --TODO support multiple aggregations within the same projection -ERROR = !Cannot use non GROUP BY column 'L3' in query results without an aggregate function -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-2883/.s.monetdb.36767 -QUERY = select count(aa) over (), - avg(aa) over () * count(aa) from analytics group by aa; --TODO -ERROR = !Cannot use non GROUP BY column 'L2' in query results without an aggregate function -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-2883/.s.monetdb.36767 -QUERY = select cast(sum(aa) over () as bigint), - cast(sum(aa) over () as bigint), - cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; --TODO -ERROR = !Cannot use non GROUP BY column in query results without an aggregate function -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-2883/.s.monetdb.36767 -QUERY = select 21 - avg(sum(aa)) over (), - avg(45 * count(aa) + sum(aa)) over (), - cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; --TODO -ERROR = !Cannot use non GROUP BY column in query results without an aggregate function -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-4999/.s.monetdb.31453 +MAPI = (monetdb) /var/tmp/mtest-17924/.s.monetdb.36475 QUERY = select cast(sum(aa) * 100 / sum(sum(aa)) over (partition by bb) as bigint) from analytics; --error, nesting aggregation functions ERROR = !SELECT: identifier 'bb' unknown CODE = 42000 diff --git a/sql/test/analytics/Tests/analytics09.stable.out b/sql/test/analytics/Tests/analytics09.stable.out --- a/sql/test/analytics/Tests/analytics09.stable.out +++ b/sql/test/analytics/Tests/analytics09.stable.out @@ -179,6 +179,22 @@ Ready. [ 1 ] [ 1 ] [ 1 ] +#select avg(sum(aa)) over (), +# avg(sum(aa)) over (rows unbounded preceding), +# cast(sum(aa) * count(aa) / avg(aa) over (rows between current row and unbounded following) as bigint), +# avg(sum(aa)) over (range unbounded preceding) from analytics group by aa; +% sys.L3, sys.L7, sys.L16, sys.L21 # table_name +% L3, L7, L16, L21 # name +% double, double, bigint, double # type +% 24, 24, 1, 24 # length +[ 6.571428571, 15, 2, 6.571428571 ] +[ 6.571428571, 10.5, 3, 6.571428571 ] +[ 6.571428571, 7.666666667, 0, 6.571428571 ] +[ 6.571428571, 7, 1, 6.571428571 ] +[ 6.571428571, 7, NULL, 6.571428571 ] +[ 6.571428571, 6.4, 1, 6.571428571 ] +[ 6.571428571, 6.333333333, 1, 6.571428571 ] +[ 6.571428571, 6.571428571, 1, 6.571428571 ] #select cast(sum(aa) * count(aa) over () as bigint), # cast(sum(aa) over () as bigint) from analytics group by aa; % sys.L5, sys.L11 # table_name @@ -207,6 +223,50 @@ Ready. [ 46, 32 ] [ 46, 48 ] [ 46, 64 ] +#select count(aa) over (), +# avg(aa) over () * count(aa) from analytics group by aa; +% sys.L2, sys.L10 # table_name +% L2, L10 # name +% bigint, double # type +% 1, 24 # length +[ 7, 6.142857143 ] +[ 7, 12.28571429 ] +[ 7, 6.142857143 ] +[ 7, 6.142857143 ] +[ 7, 0 ] +[ 7, 6.142857143 ] +[ 7, 6.142857143 ] +[ 7, 6.142857143 ] +#select cast(sum(aa) over () as bigint), +# cast(sum(aa) over () as bigint), +# cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; +% sys.L4, sys.L10, sys.L15 # table_name +% L4, L10, L15 # name +% bigint, bigint, bigint # type +% 2, 2, 3 # length +[ 43, 43, 105 ] +[ 43, 43, 42 ] +[ 43, 43, 14 ] +[ 43, 43, 35 ] +[ 43, 43, NULL ] +[ 43, 43, 28 ] +[ 43, 43, 42 ] +[ 43, 43, 56 ] +#select 21 - avg(sum(aa)) over (), +# avg(45 * count(aa) + sum(aa)) over (), +# cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; +% .L5, .L10, sys.L16 # table_name +% L5, L10, L16 # name +% double, double, bigint # type +% 24, 24, 3 # length +[ 14.42857143, 58, 105 ] +[ 14.42857143, 58, 42 ] +[ 14.42857143, 58, 14 ] +[ 14.42857143, 58, 35 ] +[ 14.42857143, 58, NULL ] +[ 14.42857143, 58, 28 ] +[ 14.42857143, 58, 42 ] +[ 14.42857143, 58, 56 ] #select avg(sum(aa)) over (partition by bb) from analytics group by bb; % sys.L4 # table_name % L4 # name _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list