Changeset: 7d791b24a2de for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d791b24a2de Added Files: clients/Tests/MAL-signatures.stable.out.Windows clients/Tests/SQL-dump.stable.out.32bit clients/Tests/SQL-dump.stable.out.oid32 sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit Removed Files: sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows.32.bit Modified Files: clients/Tests/MAL-signatures.stable.out gdk/gdk_private.h monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows sql/backends/monet5/sql.mx sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Darwin.32bit sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Windows sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Darwin.32bit sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows Branch: default Log Message:
merged diffs (truncated from 61922 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 @@ -2908,10 +2908,34 @@ command batsql.alpha(dec:bat[:oid,:dbl], address SQLbat_alpha_cst; comment BAT implementation of astronomy alpha function +command batsql.dec_round(v:bat[:oid,:lng],r:lng):bat[:oid,:lng] +address lng_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + +command batsql.dec_round(v:bat[:oid,:int],r:int):bat[:oid,:int] +address int_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + +command batsql.dec_round(v:bat[:oid,:sht],r:sht):bat[:oid,:sht] +address sht_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + +command batsql.dec_round(v:bat[:oid,:bte],r:bte):bat[:oid,:bte] +address bte_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + pattern batsql.next_value(sname:bat[:oid,:str],sequence:str):bat[:oid,:lng] address mvc_bat_next_value; comment return the next value of the sequence +command batsql.round(v:bat[:oid,:dbl],r:bte):bat[:oid,:dbl] +address dbl_bat_round_wrap; +comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) + +command batsql.round(v:bat[:oid,:flt],r:bte):bat[:oid,:flt] +address flt_bat_round_wrap; +comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) + command batgeom.point(x:bat[:oid,:dbl],y:bat[:oid,:dbl]):bat[:oid,:wkb] address wkbcreatepoint_bat; comment Construct a point-BAT from two geometry-BATs @@ -42062,10 +42086,18 @@ command sql.dense_rank_grp(b:bat[:oid,:a address sql_dense_rank_grp; comment return the densely ranked groups +command sql.dec_round(v:bat[:oid,:dbl],r:dbl):bat[:oid,:dbl] +address dbl_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command sql.dec_round(v:dbl,r:dbl):dbl address dbl_dec_round_wrap; comment round off the value v to nearests multiple of r +command sql.dec_round(v:bat[:oid,:flt],r:flt):bat[:oid,:flt] +address flt_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command sql.dec_round(v:flt,r:flt):flt address flt_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -42298,18 +42330,34 @@ command sql.round(v:flt,r:bte):flt address flt_round_wrap; comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) +command sql.round(v:bat[:oid,:lng],d:int,s:int,r:bte):bat[:oid,:lng] +address lng_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command sql.round(v:lng,d:int,s:int,r:bte):lng address lng_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command sql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] +address int_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command sql.round(v:int,d:int,s:int,r:bte):int address int_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command sql.round(v:bat[:oid,:sht],d:int,s:int,r:bte):bat[:oid,:sht] +address sht_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command sql.round(v:sht,d:int,s:int,r:bte):sht address sht_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command sql.round(v:bat[:oid,:bte],d:int,s:int,r:bte):bat[:oid,:bte] +address bte_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command sql.round(v:bte,d:int,s:int,r:bte):bte address bte_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) diff --git a/clients/Tests/MAL-signatures.stable.out.Windows b/clients/Tests/MAL-signatures.stable.out.Windows new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures.stable.out.Windows @@ -0,0 +1,43296 @@ +stdout of test 'MAL-signatures` in directory 'clients` itself: + + +# 20:07:36 > +# 20:07:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31131" "--set" "mapi_usock=/var/tmp/mtest-1103/.s.monetdb.31131" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_clients" "MAL-signatures.mal" +# 20:07:36 > + +# MonetDB 5 server v11.15.12 +# 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 +# Found 15.591 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:31131/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1103/.s.monetdb.31131 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded + +Ready. + +# 00:44:35 > +# 00:44:35 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13629" "--port=31724" +# 00:44:35 > + +#?*) +command aggr.avg(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) +address AGGRavg23_dbl; +comment Grouped tail average on dbl, also returns count + +command aggr.avg(b:bat[:oid,:dbl],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) +address AGGRavg22_dbl; +comment Grouped tail average on dbl, also returns count + +command aggr.avg(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg13_dbl; +comment Grouped tail average on dbl + +command aggr.avg(b:bat[:oid,:dbl],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg12_dbl; +comment Grouped tail average on dbl + +command aggr.avg(b:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) +address AGGRavg23_dbl; +comment Grouped tail average on flt, also returns count + +command aggr.avg(b:bat[:oid,:flt],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) +address AGGRavg22_dbl; +comment Grouped tail average on flt, also returns count + +command aggr.avg(b:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg13_dbl; +comment Grouped tail average on flt + +command aggr.avg(b:bat[:oid,:flt],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg12_dbl; +comment Grouped tail average on flt + +command aggr.avg(b:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) +address AGGRavg23_dbl; +comment Grouped tail average on lng, also returns count + +command aggr.avg(b:bat[:oid,:lng],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) +address AGGRavg22_dbl; +comment Grouped tail average on lng, also returns count + +command aggr.avg(b:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg13_dbl; +comment Grouped tail average on lng + +command aggr.avg(b:bat[:oid,:lng],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg12_dbl; +comment Grouped tail average on lng + +command aggr.avg(b:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) +address AGGRavg23_dbl; +comment Grouped tail average on wrd, also returns count + +command aggr.avg(b:bat[:oid,:wrd],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) +address AGGRavg22_dbl; +comment Grouped tail average on wrd, also returns count + +command aggr.avg(b:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg13_dbl; +comment Grouped tail average on wrd + +command aggr.avg(b:bat[:oid,:wrd],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg12_dbl; +comment Grouped tail average on wrd + +command aggr.avg(b:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) +address AGGRavg23_dbl; +comment Grouped tail average on int, also returns count + +command aggr.avg(b:bat[:oid,:int],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) +address AGGRavg22_dbl; +comment Grouped tail average on int, also returns count + +command aggr.avg(b:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg13_dbl; +comment Grouped tail average on int + +command aggr.avg(b:bat[:oid,:int],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg12_dbl; +comment Grouped tail average on int + +command aggr.avg(b:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) +address AGGRavg23_dbl; +comment Grouped tail average on sht, also returns count + +command aggr.avg(b:bat[:oid,:sht],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) +address AGGRavg22_dbl; +comment Grouped tail average on sht, also returns count + +command aggr.avg(b:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg13_dbl; +comment Grouped tail average on sht + +command aggr.avg(b:bat[:oid,:sht],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg12_dbl; +comment Grouped tail average on sht + +command aggr.avg(b:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) +address AGGRavg23_dbl; +comment Grouped tail average on bte, also returns count + +command aggr.avg(b:bat[:oid,:bte],e:bat[:oid,:any_1]) (X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) +address AGGRavg22_dbl; +comment Grouped tail average on bte, also returns count + +command aggr.avg(b:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg13_dbl; +comment Grouped tail average on bte + +command aggr.avg(b:bat[:oid,:bte],e:bat[:oid,:any_1]):bat[:oid,:dbl] +address AGGRavg12_dbl; +comment Grouped tail average on bte + +command aggr.avg(b:bat[:any_1,:dbl]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:any_1,:flt]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:any_1,:lng]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:any_1,:wrd]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:any_1,:int]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:any_1,:sht]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:any_1,:bte]):dbl +address ALGavg; +comment Gives the avg of all tail values + +function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; +function aggr.covar(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; +function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl]):dbl; +function aggr.covar(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl]):dbl; +function aggr.corr(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt]; +function aggr.covar(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt]; +function aggr.corr(e1:bat[:oid,:flt],e2:bat[:oid,:flt]):flt; +function aggr.covar(e1:bat[:oid,:flt],e2:bat[:oid,:flt]):flt; +function aggr.corr(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng]; +function aggr.covar(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng]; +function aggr.corr(e1:bat[:oid,:lng],e2:bat[:oid,:lng]):lng; +function aggr.covar(e1:bat[:oid,:lng],e2:bat[:oid,:lng]):lng; +function aggr.corr(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd]; +function aggr.covar(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd]; +function aggr.corr(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd]):wrd; +function aggr.covar(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd]):wrd; +function aggr.corr(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int]; +function aggr.covar(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int]; +function aggr.corr(e1:bat[:oid,:int],e2:bat[:oid,:int]):int; +function aggr.covar(e1:bat[:oid,:int],e2:bat[:oid,:int]):int; +function aggr.corr(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht]; +function aggr.covar(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht]; +function aggr.corr(e1:bat[:oid,:sht],e2:bat[:oid,:sht]):sht; +function aggr.covar(e1:bat[:oid,:sht],e2:bat[:oid,:sht]):sht; +function aggr.corr(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte]; +function aggr.covar(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte]; +function aggr.corr(e1:bat[:oid,:bte],e2:bat[:oid,:bte]):bte; +function aggr.covar(e1:bat[:oid,:bte],e2:bat[:oid,:bte]):bte; +command aggr.count_no_nil(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd] +address AGGRcount3nonils; +command aggr.count(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd] +address AGGRcount3nils; +comment Grouped count + +command aggr.count_no_nil(b:bat[:oid,:any_1],e:bat[:oid,:any_1]):bat[:oid,:wrd] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
