Changeset: 702995bd4b14 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=702995bd4b14 Added Files: clients/Tests/MAL-signatures_gsl.malC.src clients/Tests/MAL-signatures_gsl.stable.err clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/SQL-dump_gsl.sql.src clients/Tests/SQL-dump_gsl.stable.err clients/Tests/SQL-dump_gsl.stable.out sql/test/BugTracker-2013/Tests/restore-uuid.Bug-3407.sql sql/test/BugTracker-2013/Tests/restore-uuid.Bug-3407.stable.err sql/test/BugTracker-2013/Tests/restore-uuid.Bug-3407.stable.out Removed Files: clients/Tests/MAL-signatures_nogeom.malC.src clients/Tests/MAL-signatures_nogeom.stable.err clients/Tests/MAL-signatures_nogeom.stable.out Modified Files: clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_sphinxclient.stable.out clients/Tests/exports.stable.out monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/uuid.h monetdb5/modules/atoms/uuid.mal sql/test/BugTracker-2013/Tests/All sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out Branch: default Log Message:
Merge with Jan2014 branch. diffs (truncated from 95809 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,7 +1,8 @@ exports -HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT?MAL-signatures -HAVE_GEOM&HAVE_CFITSIO&HAVE_SPHINXCLIENT?MAL-signatures_sphinxclient -!HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT?MAL-signatures_nogeom -!HAVE_CFITSIO&HAVE_GEOM&!HAVE_SPHINXCLIENT?MAL-signatures_nocfitsio -HAVE_GEOM?SQL-dump -!HAVE_GEOM?SQL-dump_nogeom +HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&!HAVE_GSL?MAL-signatures +HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&HAVE_GSL?MAL-signatures_gsl +HAVE_GEOM&HAVE_CFITSIO&HAVE_SPHINXCLIENT&!HAVE_GSL?MAL-signatures_sphinxclient +!HAVE_CFITSIO&HAVE_GEOM&!HAVE_SPHINXCLIENT&!HAVE_GSL?MAL-signatures_nocfitsio +HAVE_GEOM&!HAVE_GSL?SQL-dump +HAVE_GEOM&HAVE_GSL?SQL-dump_gsl +!HAVE_GEOM&!HAVE_GSL?SQL-dump_nogeom 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 @@ -36705,6 +36705,10 @@ pattern calc.isnil(v:date):bit address CMDvarISNIL; comment Nil test for date value +pattern calc.isnil(v:json):bit +address CMDvarISNIL; +comment Nil test for json value + command calc.isnil(v:sqlblob):bit address BLOB_isnil; comment Nil test for blob value @@ -43183,6 +43187,10 @@ command url.url(s:str):url address URLnew; comment Create an URL from a string literal +command uuid.#fromstr():uuid +address UUIDfromString; +comment Convert string to uuid + command uuid.isaUUID(u:uuid):bit address UUIDisaUUID; comment Test a string for a UUID format @@ -43195,7 +43203,7 @@ command uuid.str(u:uuid):str address UUIDuuid2str; comment Coerce a uuid to its string type -command uuid.#tostr():void +command uuid.#tostr():str address UUIDtoString; comment Convert uuid to string equivalent diff --git a/clients/Tests/MAL-signatures_gsl.malC.src b/clients/Tests/MAL-signatures_gsl.malC.src new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_gsl.malC.src @@ -0,0 +1,1 @@ +$RELSRCDIR/MAL-signatures.malC diff --git a/clients/Tests/MAL-signatures_gsl.stable.err b/clients/Tests/MAL-signatures_gsl.stable.err new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_gsl.stable.err @@ -0,0 +1,35 @@ +stderr of test 'MAL-signatures_gsl` 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_gsl.stable.out b/clients/Tests/MAL-signatures_gsl.stable.out new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_gsl.stable.out @@ -0,0 +1,43406 @@ +stdout of test 'MAL-signatures_gsl` 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-2013 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[: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] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
