Changeset: e62b65811c0a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e62b65811c0a Added Files: clients/Tests/MAL-signatures_bam.malC.src clients/Tests/MAL-signatures_bam.stable.err clients/Tests/MAL-signatures_bam.stable.out clients/Tests/SQL-dump_bam.sql.src clients/Tests/SQL-dump_bam.stable.err clients/Tests/SQL-dump_bam.stable.out clients/Tests/SQL-dump_bam.stable.out.oid32 sql/test/Tests/systemfunctions_bam.sql.src sql/test/Tests/systemfunctions_bam.stable.err sql/test/Tests/systemfunctions_bam.stable.out sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566_bam.sql.src sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566_bam.stable.err sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566_bam.stable.out sql/test/leaks/Tests/check0_bam.sql.src sql/test/leaks/Tests/check0_bam.stable.err sql/test/leaks/Tests/check0_bam.stable.out sql/test/leaks/Tests/check1_bam.sql.src sql/test/leaks/Tests/check1_bam.stable.err sql/test/leaks/Tests/check1_bam.stable.out sql/test/leaks/Tests/check2_bam.sql.src sql/test/leaks/Tests/check2_bam.stable.err sql/test/leaks/Tests/check2_bam.stable.out sql/test/leaks/Tests/check3_bam.sql.src sql/test/leaks/Tests/check3_bam.stable.err sql/test/leaks/Tests/check3_bam.stable.out sql/test/leaks/Tests/check4_bam.sql.src sql/test/leaks/Tests/check4_bam.stable.err sql/test/leaks/Tests/check4_bam.stable.out sql/test/leaks/Tests/check5_bam.sql.src sql/test/leaks/Tests/check5_bam.stable.err sql/test/leaks/Tests/check5_bam.stable.out sql/test/leaks/Tests/drop3_bam.sql.src sql/test/leaks/Tests/drop3_bam.stable.err sql/test/leaks/Tests/drop3_bam.stable.out sql/test/leaks/Tests/select1_bam.sql.src sql/test/leaks/Tests/select1_bam.stable.err sql/test/leaks/Tests/select1_bam.stable.out sql/test/leaks/Tests/select2_bam.sql.src sql/test/leaks/Tests/select2_bam.stable.err sql/test/leaks/Tests/select2_bam.stable.out sql/test/leaks/Tests/temp1_bam.sql.src sql/test/leaks/Tests/temp1_bam.stable.err sql/test/leaks/Tests/temp1_bam.stable.out sql/test/leaks/Tests/temp2_bam.sql.src sql/test/leaks/Tests/temp2_bam.stable.err sql/test/leaks/Tests/temp2_bam.stable.out sql/test/leaks/Tests/temp3_bam.sql.src sql/test/leaks/Tests/temp3_bam.stable.err sql/test/leaks/Tests/temp3_bam.stable.out Modified Files: clients/Tests/All sql/test/Tests/All sql/test/leaks/Tests/All Branch: default Log Message:
added test variants in case we have BAM support, i.e., HAVE_SAMTOOLS these are adapted copies of the GSL variants, since in our testing farm, we only have samtools, if we also have gsl (i.e., on Fedora Linux) diffs (truncated from 63604 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,8 +1,10 @@ exports HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&!HAVE_GSL&!HAVE_SAMTOOLS?MAL-signatures HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&HAVE_GSL&!HAVE_SAMTOOLS?MAL-signatures_gsl +HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&HAVE_GSL&HAVE_SAMTOOLS?MAL-signatures_bam HAVE_GEOM&HAVE_CFITSIO&HAVE_SPHINXCLIENT&!HAVE_GSL&!HAVE_SAMTOOLS?MAL-signatures_sphinxclient HAVE_GEOM&!HAVE_CFITSIO&!HAVE_SPHINXCLIENT&!HAVE_GSL&!HAVE_SAMTOOLS?MAL-signatures_nocfitsio HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?SQL-dump_bam !HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_nogeom diff --git a/clients/Tests/MAL-signatures_bam.malC.src b/clients/Tests/MAL-signatures_bam.malC.src new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_bam.malC.src @@ -0,0 +1,1 @@ +$RELSRCDIR/MAL-signatures.malC diff --git a/clients/Tests/MAL-signatures_bam.stable.err b/clients/Tests/MAL-signatures_bam.stable.err new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_bam.stable.err @@ -0,0 +1,35 @@ +stderr of test 'MAL-signatures_bam` in directory 'clients` itself: + + +# 14:24:10 > +# 14:24:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31236" "--set" "mapi_usock=/var/tmp/mtest-21213/.s.monetdb.31236" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set" "mal_listing=2" +# 14:24:10 > + +# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = yes +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31236 +# cmdline opt mapi_usock = /var/tmp/mtest-21213/.s.monetdb.31236 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients +# cmdline opt mal_listing = 2 + +# 14:24:10 > +# 14:24:10 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21213" "--port=31236" +# 14:24:10 > + + +# 14:24:13 > +# 14:24:13 > "Done." +# 14:24:13 > + diff --git a/clients/Tests/MAL-signatures_bam.stable.out b/clients/Tests/MAL-signatures_bam.stable.out new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_bam.stable.out @@ -0,0 +1,42847 @@ +stdout of test 'MAL-signatures_bam` in directory 'clients` itself: + + +# 14:24:10 > +# 14:24:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31236" "--set" "mapi_usock=/var/tmp/mtest-21213/.s.monetdb.31236" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set" "mal_listing=2" +# 14:24:10 > + +# MonetDB 5 server v11.17.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 +# Found 15.591 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:31236/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-21213/.s.monetdb.31236 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded + +Ready. + +# 14:24:10 > +# 14:24:10 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21213" "--port=31236" +# 14:24:10 > + +#?*) +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[:oid,:dbl]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:oid,:flt]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:oid,:lng]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:oid,:wrd]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:oid,:int]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:oid,:sht]):dbl +address ALGavg; +comment Gives the avg of all tail values + +command aggr.avg(b:bat[:oid,: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] +address AGGRcount2nonils; +command aggr.count(b:bat[:void,:any_1],e:bat[:void,:any_2]):bat[:void,:wrd] +address AGGRcount2nils; +command aggr.count(b:bat[:void,:any_1],e:bat[:oid,:any_2]):bat[:void,:wrd] +address AGGRcount2nils; +comment Grouped count + +command aggr.count(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],ignorenils:bit):bat[:void,:wrd] +address AGGRcount3; +command aggr.count(b:bat[:oid,:any_1],e:bat[:oid,:any_2],ignorenils:bit):bat[:oid,:wrd] +address AGGRcount2; +comment Grouped count + +command aggr.cardinality(b:bat[:oid,:any_2]):lng +address ALGcard; +comment Return the cardinality of the BAT tail values. + +command aggr.count_no_nil(b:bat[:any_1,:any_2]):wrd +address ALGcount_no_nil; +comment Return the number of elements currently in a BAT ignoring BUNs with nil-tail + +command aggr.count(b:bat[:any_1,:any],ignore_nils:bit):wrd +address ALGcount_nil; +comment Return the number of elements currently in a BAT ignores BUNs with nil-tail iff ignore_nils==TRUE. + +command aggr.count(b:bat[:any_1,:any]):wrd +address ALGcount_bat; +comment Return the current size (in number of elements) in a BAT. + +command aggr.exist(b:bat[:oid,:any_2],h:any_1):bit +address ALGexist; +command aggr.histogram(b:bat[:any_1,:any_2]):bat[:any_2,:int] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
