Changeset: 0b113471dc92 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b113471dc92 Added Files: clients/Tests/MAL-signatures_all.malC.src clients/Tests/MAL-signatures_all.stable.err clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_none.malC.src clients/Tests/MAL-signatures_none.stable.err clients/Tests/MAL-signatures_none.stable.out clients/Tests/MAL-signatures_none.stable.out.int128 clients/Tests/SQL-dump_all.sql.src clients/Tests/SQL-dump_all.stable.err clients/Tests/SQL-dump_all.stable.out clients/Tests/SQL-dump_all.stable.out.int128 clients/Tests/SQL-dump_all.stable.out.oid32 clients/Tests/SQL-dump_all.stable.out.oid32.int128 clients/Tests/SQL-dump_none.sql.src clients/Tests/SQL-dump_none.stable.err clients/Tests/SQL-dump_none.stable.out clients/Tests/SQL-dump_none.stable.out.int128 Removed Files: clients/Tests/MAL-signatures_sphinxclient.malC.src clients/Tests/MAL-signatures_sphinxclient.stable.err clients/Tests/MAL-signatures_sphinxclient.stable.out clients/Tests/MAL-signatures_sphinxclient.stable.out.int128 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.int128 clients/Tests/SQL-dump_bam.stable.out.oid32 clients/Tests/SQL-dump_bam.stable.out.oid32.int128 clients/Tests/SQL-dump_gsl.sql.src clients/Tests/SQL-dump_gsl.stable.err clients/Tests/SQL-dump_gsl.stable.out clients/Tests/SQL-dump_gsl.stable.out.int128 clients/Tests/SQL-dump_gsl.stable.out.oid32 clients/Tests/SQL-dump_gsl.stable.out.oid32.int128 clients/Tests/SQL-dump_nogeom.sql.src clients/Tests/SQL-dump_nogeom.stable.err clients/Tests/SQL-dump_nogeom.stable.out clients/Tests/SQL-dump_nogeom.stable.out.int128 Modified Files: clients/Tests/All clients/Tests/SQL-dump.stable.out.32bit configure.ag Branch: mosaic Log Message:
Merged with default branch. diffs (truncated from 324920 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -3,9 +3,9 @@ HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_L HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_gsl HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&!HAVE_LIBR&HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_bam HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_R -HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures_sphinxclient !HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_nocfitsio +HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures_all +!HAVE_CFITSIO&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_none 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 +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?SQL-dump_all +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_none diff --git a/clients/Tests/MAL-signatures_all.malC.src b/clients/Tests/MAL-signatures_all.malC.src new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_all.malC.src @@ -0,0 +1,1 @@ +$RELSRCDIR/MAL-signatures.malC diff --git a/clients/Tests/MAL-signatures_all.stable.err b/clients/Tests/MAL-signatures_all.stable.err new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_all.stable.err @@ -0,0 +1,35 @@ +stderr of test 'MAL-signatures_all` 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 > + +# builtin opt gdk_dbpath = /home/sjoerd/Monet-stable/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# 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 = 35607 +# cmdline opt mapi_usock = /var/tmp/mtest-19610/.s.monetdb.35607 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /home/sjoerd/Monet-stable/var/MonetDB/mTests_clients +# cmdline opt mal_listing = 2 + +# 21:33:48 > +# 21:33:48 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-19610" "--port=35607" +# 21:33:48 > + + +# 21:33:51 > +# 21:33:51 > "Done." +# 21:33:51 > + diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -0,0 +1,42706 @@ +stdout of test 'MAL-signatures_all` 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+) +# 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 7.734 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://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 > + +#?*) +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,:any_2]):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] +address ALGhistogram; +comment Produce a BAT containing the histogram over the tail values. + +command aggr.jsonaggr(val:bat[:oid,:dbl]):str +address JSONgroupStr; +comment Aggregate the double values to array. + +command aggr.jsonaggr(val:bat[:oid,:str]):str +address JSONgroupStr; +comment Aggregate the string values to array. + +function aggr.median(b:bat[:oid,:any_1]):any_1; +command aggr.median(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] +address AGGRmedian3; +comment Grouped median aggregate + +command aggr.max(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] +address AGGRmax3; +command aggr.min(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] +address AGGRmin3; +command aggr.max(b:bat[:oid,:any_1],e:bat[:oid,:any_2]):bat[:oid,:any_1] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
