Changeset: 00cbab18ed8b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00cbab18ed8b Added Files: clients/Tests/MAL-signatures_nogeom.malC.src clients/Tests/MAL-signatures_nogeom.stable.err clients/Tests/MAL-signatures_nogeom.stable.out clients/Tests/SQL-dump_nogeom.sql.src clients/Tests/SQL-dump_nogeom.stable.err clients/Tests/SQL-dump_nogeom.stable.out sql/benchmarks/tpch/fileleak/Tests/delete_all_nogeom.SQL.py.src sql/benchmarks/tpch/fileleak/Tests/delete_all_nogeom.stable.err sql/benchmarks/tpch/fileleak/Tests/delete_all_nogeom.stable.out sql/benchmarks/tpch/fileleak/Tests/leaks_nogeom.SQL.py.src sql/benchmarks/tpch/fileleak/Tests/leaks_nogeom.stable.err sql/benchmarks/tpch/fileleak/Tests/leaks_nogeom.stable.out Modified Files: clients/Tests/All common/stream/stream.c sql/backends/monet5/sql.mx sql/benchmarks/tpch/fileleak/Tests/All sql/server/rel_select.c sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/leaks/Tests/temp2_nogeom.stable.out Branch: default Log Message:
Merge with Feb2013 branch. diffs (truncated from 51777 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,3 +1,5 @@ exports -MAL-signatures -SQL-dump +HAVE_GEOM?MAL-signatures +!HAVE_GEOM?MAL-signatures_nogeom +HAVE_GEOM?SQL-dump +!HAVE_GEOM?SQL-dump_nogeom diff --git a/clients/Tests/MAL-signatures_nogeom.malC.src b/clients/Tests/MAL-signatures_nogeom.malC.src new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_nogeom.malC.src @@ -0,0 +1,1 @@ +$RELSRCDIR/MAL-signatures.malC diff --git a/clients/Tests/MAL-signatures_nogeom.stable.err b/clients/Tests/MAL-signatures_nogeom.stable.err new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_nogeom.stable.err @@ -0,0 +1,29 @@ +stderr of test 'MAL-signatures_nogeom` 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_nogeom.mal" +# 20:07:36 > + +# builtin opt gdk_dbpath = /ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/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 = 31131 +# cmdline opt mapi_usock = /var/tmp/mtest-1103/.s.monetdb.31131 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_clients + +# 20:07:38 > +# 20:07:38 > "Done." +# 20:07:38 > + diff --git a/clients/Tests/MAL-signatures_nogeom.stable.out b/clients/Tests/MAL-signatures_nogeom.stable.out new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures_nogeom.stable.out @@ -0,0 +1,43108 @@ +stdout of test 'MAL-signatures_nogeom` 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_nogeom.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] +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[:any_1,: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[:any_1,: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. + +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] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
