Changeset: fde44fca3a76 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fde44fca3a76 Added Files: sql/test/BugTracker-2016/Tests/epoch.Bug-3979.sql sql/test/BugTracker-2016/Tests/epoch.Bug-3979.stable.err sql/test/BugTracker-2016/Tests/epoch.Bug-3979.stable.out sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.sql sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.err sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.out sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.sql sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.err sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.out sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.sql sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.stable.err sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.stable.out Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.mal monetdb5/optimizer/opt_pipes.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_aggr_bte.mal sql/backends/monet5/sql_aggr_dbl.mal sql/backends/monet5/sql_aggr_flt.mal sql/backends/monet5/sql_aggr_hge.mal sql/backends/monet5/sql_aggr_int.mal sql/backends/monet5/sql_aggr_lng.mal sql/backends/monet5/sql_aggr_sht.mal sql/backends/monet5/sql_aggr_wrd.mal sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_statement.c sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/13-plan.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 sql/server/rel_optimizer.c sql/server/rel_rel.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_select.h sql/storage/bat/bat_storage.c sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out sql/test/Tests/setoptimizer.stable.out sql/test/Tests/setoptimizer.stable.out.Windows sql/test/mergetables/Tests/mergequery.stable.out sql/test/remote/Tests/partition_elim.stable.out Branch: Jun2016 Log Message:
merge diffs (truncated from 14535 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -1,29 +1,32 @@ stdout of test 'MAL-signatures` in directory 'clients` itself: -# 21:33:47 > -# 21:33:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35607" "--set" "mapi_usock=/var/tmp/mtest-19610/.s.monetdb.35607" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/sjoerd/Monet-stable/var/MonetDB/mTests_clients" "--set" "mal_listing=2" -# 21:33:47 > - -# MonetDB 5 server v11.17.22 (hg id: 570fbe10eb64+) +# 21:44:50 > +# 21:44:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33053" "--set" "mapi_usock=/var/tmp/mtest-13793/.s.monetdb.33053" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/sjoerd/Monet-devel/var/MonetDB/mTests_clients" "--set" "mal_listing=2" "--set" "embedded_r=yes" +# 21:44:50 > + +# MonetDB 5 server v11.20.0 # This is an unreleased version # Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked # Found 7.734 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. # Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://gaai.mullender.nl:35607/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-19610/.s.monetdb.35607 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded Ready. -# 21:33:48 > -# 21:33:48 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-19610" "--port=35607" -# 21:33:48 > +# 15:16:50 > +# 15:16:50 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-9622" "--port=32080" +# 15:16:50 > + +command aggr.avg(b:bat[:hge],g:bat[:oid],e:bat[:any_1]) (X_4:bat[:dbl],X_5:bat[:wrd]) +address AGGRavg23_dbl; +comment Grouped tail average on hge, also returns count + +command aggr.avg(b:bat[:hge],g:bat[:oid],e:bat[:any_1]):bat[:dbl] +address AGGRavg13_dbl; +comment Grouped tail average on hge command aggr.avg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1]) (X_4:bat[:dbl],X_5:bat[:wrd]) address AGGRavg23_dbl; @@ -85,32 +88,20 @@ pattern aggr.avg(b:bat[:any_2]):dbl address CMDcalcavg; comment Gives the avg of all tail values -function aggr.corr(e1:bat[:dbl],e2:bat[:dbl],g:bat[:oid],e:bat[:any_2]):bat[:dbl]; -function aggr.covar(e1:bat[:dbl],e2:bat[:dbl],g:bat[:oid],e:bat[:any_2]):bat[:dbl]; +function aggr.corr(e1:bat[:hge],e2:bat[:hge]):hge; +function aggr.covar(e1:bat[:hge],e2:bat[:hge]):hge; function aggr.corr(e1:bat[:dbl],e2:bat[:dbl]):dbl; function aggr.covar(e1:bat[:dbl],e2:bat[:dbl]):dbl; -function aggr.corr(e1:bat[:flt],e2:bat[:flt],g:bat[:oid],e:bat[:any_2]):bat[:flt]; -function aggr.covar(e1:bat[:flt],e2:bat[:flt],g:bat[:oid],e:bat[:any_2]):bat[:flt]; function aggr.corr(e1:bat[:flt],e2:bat[:flt]):flt; function aggr.covar(e1:bat[:flt],e2:bat[:flt]):flt; -function aggr.corr(e1:bat[:lng],e2:bat[:lng],g:bat[:oid],e:bat[:any_2]):bat[:lng]; -function aggr.covar(e1:bat[:lng],e2:bat[:lng],g:bat[:oid],e:bat[:any_2]):bat[:lng]; function aggr.corr(e1:bat[:lng],e2:bat[:lng]):lng; function aggr.covar(e1:bat[:lng],e2:bat[:lng]):lng; -function aggr.corr(e1:bat[:wrd],e2:bat[:wrd],g:bat[:oid],e:bat[:any_2]):bat[:wrd]; -function aggr.covar(e1:bat[:wrd],e2:bat[:wrd],g:bat[:oid],e:bat[:any_2]):bat[:wrd]; function aggr.corr(e1:bat[:wrd],e2:bat[:wrd]):wrd; function aggr.covar(e1:bat[:wrd],e2:bat[:wrd]):wrd; -function aggr.corr(e1:bat[:int],e2:bat[:int],g:bat[:oid],e:bat[:any_2]):bat[:int]; -function aggr.covar(e1:bat[:int],e2:bat[:int],g:bat[:oid],e:bat[:any_2]):bat[:int]; function aggr.corr(e1:bat[:int],e2:bat[:int]):int; function aggr.covar(e1:bat[:int],e2:bat[:int]):int; -function aggr.corr(e1:bat[:sht],e2:bat[:sht],g:bat[:oid],e:bat[:any_2]):bat[:sht]; -function aggr.covar(e1:bat[:sht],e2:bat[:sht],g:bat[:oid],e:bat[:any_2]):bat[:sht]; function aggr.corr(e1:bat[:sht],e2:bat[:sht]):sht; function aggr.covar(e1:bat[:sht],e2:bat[:sht]):sht; -function aggr.corr(e1:bat[:bte],e2:bat[:bte],g:bat[:oid],e:bat[:any_2]):bat[:bte]; -function aggr.covar(e1:bat[:bte],e2:bat[:bte],g:bat[:oid],e:bat[:any_2]):bat[:bte]; function aggr.corr(e1:bat[:bte],e2:bat[:bte]):bte; function aggr.covar(e1:bat[:bte],e2:bat[:bte]):bte; command aggr.count_no_nil(b:bat[:any_1],g:bat[:oid],e:bat[:any_2]):bat[:wrd] @@ -532,6 +523,142 @@ pattern aggr.prod(b:bat[:bte]):bte address CMDBATprod; comment Calculate aggregate product of B. +pattern aggr.prod(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):dbl +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:hge],s:bat[:oid]):dbl +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:hge],nil_if_empty:bit):dbl +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:hge]):dbl +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:hge],s:bat[:oid]):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:hge],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:hge]):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:lng],s:bat[:oid],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:lng],s:bat[:oid]):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:lng],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:lng]):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:wrd],s:bat[:oid],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:wrd],s:bat[:oid]):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:wrd],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:wrd]):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:int],s:bat[:oid],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:int],s:bat[:oid]):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:int],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:int]):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:sht],s:bat[:oid],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:sht],s:bat[:oid]):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:sht],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:sht]):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:bte],s:bat[:oid],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:bte],s:bat[:oid]):hge +address CMDBATprod; +comment Calculate aggregate product of B with candidate list. + +pattern aggr.prod(b:bat[:bte],nil_if_empty:bit):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +pattern aggr.prod(b:bat[:bte]):hge +address CMDBATprod; +comment Calculate aggregate product of B. + +command aggr.prod(b:bat[:hge],g:bat[:oid],e:bat[:any_1]):bat[:hge] +address AGGRprod3_hge; +comment Grouped tail product on hge + +command aggr.prod(b:bat[:lng],g:bat[:oid],e:bat[:any_1]):bat[:hge] +address AGGRprod3_hge; +comment Grouped tail product on lng + +command aggr.prod(b:bat[:wrd],g:bat[:oid],e:bat[:any_1]):bat[:hge] +address AGGRprod3_hge; +comment Grouped tail product on wrd + +command aggr.prod(b:bat[:int],g:bat[:oid],e:bat[:any_1]):bat[:hge] +address AGGRprod3_hge; +comment Grouped tail product on int + +command aggr.prod(b:bat[:sht],g:bat[:oid],e:bat[:any_1]):bat[:hge] +address AGGRprod3_hge; +comment Grouped tail product on sht + +command aggr.prod(b:bat[:bte],g:bat[:oid],e:bat[:any_1]):bat[:hge] +address AGGRprod3_hge; +comment Grouped tail product on bte + command aggr.prod(b:bat[:dbl],g:bat[:oid],e:bat[:any_1]):bat[:dbl] address AGGRprod3_dbl; comment Grouped tail product on dbl @@ -609,6 +736,22 @@ command aggr.quantile(b:bat[:any_1],g:ba address AGGRquantile3; comment Grouped quantile aggregate +function aggr.subcorr(e1:bat[:hge],e2:bat[:hge],g:bat[:oid],e:bat[:any_2],f:bit):bat[:hge]; +function aggr.subcovar(e1:bat[:hge],e2:bat[:hge],g:bat[:oid],e:bat[:any_2],f:bit):bat[:hge]; +function aggr.subcorr(e1:bat[:dbl],e2:bat[:dbl],g:bat[:oid],e:bat[:any_2],f:bit):bat[:dbl]; +function aggr.subcovar(e1:bat[:dbl],e2:bat[:dbl],g:bat[:oid],e:bat[:any_2],f:bit):bat[:dbl]; +function aggr.subcorr(e1:bat[:flt],e2:bat[:flt],g:bat[:oid],e:bat[:any_2],f:bit):bat[:flt]; +function aggr.subcovar(e1:bat[:flt],e2:bat[:flt],g:bat[:oid],e:bat[:any_2],f:bit):bat[:flt]; +function aggr.subcorr(e1:bat[:lng],e2:bat[:lng],g:bat[:oid],e:bat[:any_2],f:bit):bat[:lng]; +function aggr.subcovar(e1:bat[:lng],e2:bat[:lng],g:bat[:oid],e:bat[:any_2],f:bit):bat[:lng]; +function aggr.subcorr(e1:bat[:wrd],e2:bat[:wrd],g:bat[:oid],e:bat[:any_2],f:bit):bat[:wrd]; +function aggr.subcovar(e1:bat[:wrd],e2:bat[:wrd],g:bat[:oid],e:bat[:any_2],f:bit):bat[:wrd]; +function aggr.subcorr(e1:bat[:int],e2:bat[:int],g:bat[:oid],e:bat[:any_2],f:bit):bat[:int]; +function aggr.subcovar(e1:bat[:int],e2:bat[:int],g:bat[:oid],e:bat[:any_2],f:bit):bat[:int]; +function aggr.subcorr(e1:bat[:sht],e2:bat[:sht],g:bat[:oid],e:bat[:any_2],f:bit):bat[:sht]; +function aggr.subcovar(e1:bat[:sht],e2:bat[:sht],g:bat[:oid],e:bat[:any_2],f:bit):bat[:sht]; +function aggr.subcorr(e1:bat[:bte],e2:bat[:bte],g:bat[:oid],e:bat[:any_2],f:bit):bat[:bte]; +function aggr.subcovar(e1:bat[:bte],e2:bat[:bte],g:bat[:oid],e:bat[:any_2],f:bit):bat[:bte]; pattern aggr.sum(b:bat[:dbl],s:bat[:oid],nil_if_empty:bit):dbl address CMDBATsum; comment Calculate aggregate sum of B with candidate list. @@ -977,6 +1120,294 @@ pattern aggr.sum(b:bat[:bte]):bte address CMDBATsum; comment Calculate aggregate sum of B. +pattern aggr.sum(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):dbl +address CMDBATsum; +comment Calculate aggregate sum of B with candidate list. + +pattern aggr.sum(b:bat[:hge],s:bat[:oid]):dbl +address CMDBATsum; +comment Calculate aggregate sum of B with candidate list. + +pattern aggr.sum(b:bat[:hge],nil_if_empty:bit):dbl +address CMDBATsum; +comment Calculate aggregate sum of B. + +pattern aggr.sum(b:bat[:hge]):dbl +address CMDBATsum; +comment Calculate aggregate sum of B. + +pattern aggr.sum(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):hge +address CMDBATsum; +comment Calculate aggregate sum of B with candidate list. + +pattern aggr.sum(b:bat[:hge],s:bat[:oid]):hge +address CMDBATsum; +comment Calculate aggregate sum of B with candidate list. + +pattern aggr.sum(b:bat[:hge],nil_if_empty:bit):hge +address CMDBATsum; +comment Calculate aggregate sum of B. + +pattern aggr.sum(b:bat[:hge]):hge +address CMDBATsum; +comment Calculate aggregate sum of B. + +pattern aggr.sum(b:bat[:lng],s:bat[:oid],nil_if_empty:bit):hge +address CMDBATsum; +comment Calculate aggregate sum of B with candidate list. + +pattern aggr.sum(b:bat[:lng],s:bat[:oid]):hge +address CMDBATsum; +comment Calculate aggregate sum of B with candidate list. + +pattern aggr.sum(b:bat[:lng],nil_if_empty:bit):hge +address CMDBATsum; +comment Calculate aggregate sum of B. + +pattern aggr.sum(b:bat[:lng]):hge _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
