Changeset: f416807daf74 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f416807daf74 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/BugTracker-2014/Tests/boolean_not.Bug-3505.sql sql/test/BugTracker-2014/Tests/boolean_not.Bug-3505.stable.err sql/test/BugTracker-2014/Tests/boolean_not.Bug-3505.stable.out sql/test/BugTracker-2014/Tests/bug_in_cse.Bug-3511.sql sql/test/BugTracker-2014/Tests/bug_in_cse.Bug-3511.stable.err sql/test/BugTracker-2014/Tests/bug_in_cse.Bug-3511.stable.out sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.sql sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.err sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.out sql/test/BugTracker-2014/Tests/orderby_count.Bug-3526.sql sql/test/BugTracker-2014/Tests/orderby_count.Bug-3526.stable.err sql/test/BugTracker-2014/Tests/orderby_count.Bug-3526.stable.out sql/test/BugTracker-2014/Tests/select_in_crash.Bug-3491.sql sql/test/BugTracker-2014/Tests/select_in_crash.Bug-3491.stable.err sql/test/BugTracker-2014/Tests/select_in_crash.Bug-3491.stable.out sql/test/BugTracker-2014/Tests/unsafe_project_push_down.Bug-3523.sql sql/test/BugTracker-2014/Tests/unsafe_project_push_down.Bug-3523.stable.err sql/test/BugTracker-2014/Tests/unsafe_project_push_down.Bug-3523.stable.out 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: NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj clients/Tests/All clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.32bit clients/Tests/SQL-dump.stable.out.64bit.oid32 clients/Tests/SQL-dump_gsl.stable.out clients/Tests/SQL-dump_gsl.stable.out.oid32 clients/Tests/SQL-dump_nogeom.stable.out clients/mapiclient/Tests/stethoscope--help.stable.err gdk/gdk_atoms.c gdk/gdk_cross.c gdk/gdk_storage.c monetdb5/mal/Tests/All monetdb5/modules/mal/manifold.c monetdb5/optimizer/Tests/All monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_support.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_round_impl.h sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/common/sql_types.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_select.c sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.err sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Solaris sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows sql/test/BugTracker-2009/Tests/pow_operator.SF-2812721.stable.out sql/test/BugTracker-2009/Tests/rollback_bug.stable.err sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.out sql/test/BugTracker-2014/Tests/All sql/test/BugTracker/Tests/broken_join.SF-1373391.stable.err sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err sql/test/Tests/All sql/test/bugs/Tests/floor-bug-sf-967066.stable.out sql/test/centipede/Tests/All sql/test/leaks/Tests/All sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/comments.sql sql/test/pg_regress/Tests/comments.stable.err sql/test/pg_regress/Tests/comments.stable.out sql/test/pg_regress/Tests/create_table.sql sql/test/pg_regress/Tests/create_table.stable.err sql/test/pg_regress/Tests/create_table.stable.out sql/test/pg_regress/Tests/drop.sql sql/test/pg_regress/Tests/interval.sql sql/test/pg_regress/Tests/interval.stable.err sql/test/pg_regress/Tests/interval.stable.out sql/test/pg_regress/Tests/reltime.sql sql/test/pg_regress/Tests/reltime.stable.err sql/test/pg_regress/Tests/reltime.stable.out sql/test/pg_regress/postgresql2sql99.sh tools/merovingian/utils/database.c Branch: mosaic Log Message:
Merged with default branch. diffs (truncated from 68192 to 300 lines): diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj b/NT/installer32/MonetDB5-SQL-Installer.vdproj --- a/NT/installer32/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj @@ -735,12 +735,6 @@ } "Entry" { - "MsmKey" = "8:_C0E29F8AC9F24979BE47B588DB609178" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_C2680DB1FF1445FF812EF932F12A7345" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -3406,26 +3400,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C0E29F8AC9F24979BE47B588DB609178" - { - "SourcePath" = "8:lib\\monetdb5\\array.mal" - "TargetName" = "8:array.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C2680DB1FF1445FF812EF932F12A7345" { "SourcePath" = "8:lib\\monetdb5\\sql_aggr_sht.mal" diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj b/NT/installer64/MonetDB5-SQL-Installer.vdproj --- a/NT/installer64/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj @@ -735,12 +735,6 @@ } "Entry" { - "MsmKey" = "8:_C0E29F8AC9F24979BE47B588DB609178" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_C2680DB1FF1445FF812EF932F12A7345" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -3406,26 +3400,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C0E29F8AC9F24979BE47B588DB609178" - { - "SourcePath" = "8:lib\\monetdb5\\array.mal" - "TargetName" = "8:array.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C2680DB1FF1445FF812EF932F12A7345" { "SourcePath" = "8:lib\\monetdb5\\sql_aggr_sht.mal" 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 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list