Changeset: 5d30a783ecdd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d30a783ecdd Added Files: sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.sql.src sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.err sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.out sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.sql.src sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.err sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.out sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src sql/test/Dependencies/Tests/Dependencies_bam.stable.err sql/test/Dependencies/Tests/Dependencies_bam.stable.out sql/test/Tests/keys_bam.sql.src sql/test/Tests/keys_bam.stable.err sql/test/Tests/keys_bam.stable.out Modified Files: sql/test/BugTracker-2012/Tests/All sql/test/Dependencies/Tests/All sql/test/Tests/All sql/test/bugs/Tests/All Branch: bamloader Log Message:
Extended some more tests diffs (truncated from 1327 to 300 lines): diff --git a/sql/test/BugTracker-2012/Tests/All b/sql/test/BugTracker-2012/Tests/All --- a/sql/test/BugTracker-2012/Tests/All +++ b/sql/test/BugTracker-2012/Tests/All @@ -29,8 +29,10 @@ name_resolution_in_proc.Bug-3074 segfault_incorrect_head.Bug-3028 cast_varchar_to_double.Bug-3071 table_returning_func_returns_too_many_columns.Bug-3077 -table_functions_fail_after_restart-0.Bug-3063 -table_functions_fail_after_restart-1.Bug-3063 +!HAVE_SAMTOOLS?table_functions_fail_after_restart-0.Bug-3063 +HAVE_SAMTOOLS?table_functions_fail_after_restart-0.Bug-3063_bam +!HAVE_SAMTOOLS?table_functions_fail_after_restart-1.Bug-3063 +HAVE_SAMTOOLS?table_functions_fail_after_restart-1.Bug-3063_bam user_defined_decimal_function.Bug-2992 non_keyword_no.Bug-3079 round-type-inference.Bug-2987 diff --git a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.sql.src b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.sql.src new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.sql.src @@ -0,0 +1,1 @@ +$RELSRCDIR/table_functions_fail_after_restart-0.Bug-3063.sql diff --git a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.err b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.err @@ -0,0 +1,35 @@ +stderr of test 'table_functions_fail_after_restart-0.Bug-3063_bam` in directory 'sql/test/BugTracker-2012` itself: + + +# 09:28:52 > +# 09:28:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36187" "--set" "mapi_usock=/var/tmp/mtest-1669/.s.monetdb.36187" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_test_BugTracker-2012" "--set" "mal_listing=0" +# 09:28:52 > + +# builtin opt gdk_dbpath = /home/robin/MonetDB/PREFIX/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 = 36187 +# cmdline opt mapi_usock = /var/tmp/mtest-1669/.s.monetdb.36187 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_test_BugTracker-2012 +# cmdline opt mal_listing = 0 +# cmdline opt gdk_debug = 536870922 + +# 09:28:52 > +# 09:28:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1669" "--port=36187" +# 09:28:52 > + + +# 09:28:53 > +# 09:28:53 > "Done." +# 09:28:53 > diff --git a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.out b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.out @@ -0,0 +1,43 @@ +stdout of test 'table_functions_fail_after_restart-0.Bug-3063_bam` in directory 'sql/test/BugTracker-2012` itself: + + +# 09:28:52 > +# 09:28:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36187" "--set" "mapi_usock=/var/tmp/mtest-1669/.s.monetdb.36187" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_test_BugTracker-2012" "--set" "mal_listing=0" +# 09:28:52 > + +# MonetDB 5 server v11.18.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2012', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.333 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://robin-xps13:36187/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1669/.s.monetdb.36187 +# MonetDB/SQL module loaded + +Ready. + +# 09:28:52 > +# 09:28:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1669" "--port=36187" +# 09:28:52 > + +#CREATE schema ft; +#CREATE FUNCTION ft.func() +#RETURNS TABLE (sch varchar(100)) +#RETURN TABLE (SELECT s.name from sys.schemas as s); +#select * from ft.func() as ftf; +% .ftf # table_name +% sch # name +% varchar # type +% 4 # length +[ "sys" ] +[ "tmp" ] +[ "json" ] +[ "bam" ] +[ "ft" ] + +# 09:28:53 > +# 09:28:53 > "Done." +# 09:28:53 > diff --git a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.sql.src b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.sql.src new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.sql.src @@ -0,0 +1,1 @@ +$RELSRCDIR/table_functions_fail_after_restart-1.Bug-3063.sql diff --git a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.err b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.err @@ -0,0 +1,35 @@ +stderr of test 'table_functions_fail_after_restart-1.Bug-3063_bam` in directory 'sql/test/BugTracker-2012` itself: + + +# 09:28:53 > +# 09:28:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36187" "--set" "mapi_usock=/var/tmp/mtest-1669/.s.monetdb.36187" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_test_BugTracker-2012" "--set" "mal_listing=0" +# 09:28:53 > + +# builtin opt gdk_dbpath = /home/robin/MonetDB/PREFIX/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 = 36187 +# cmdline opt mapi_usock = /var/tmp/mtest-1669/.s.monetdb.36187 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_test_BugTracker-2012 +# cmdline opt mal_listing = 0 +# cmdline opt gdk_debug = 536870922 + +# 09:28:53 > +# 09:28:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1669" "--port=36187" +# 09:28:53 > + + +# 09:28:53 > +# 09:28:53 > "Done." +# 09:28:53 > diff --git a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.out b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.out @@ -0,0 +1,41 @@ +stdout of test 'table_functions_fail_after_restart-1.Bug-3063_bam` in directory 'sql/test/BugTracker-2012` itself: + + +# 09:28:53 > +# 09:28:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36187" "--set" "mapi_usock=/var/tmp/mtest-1669/.s.monetdb.36187" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_test_BugTracker-2012" "--set" "mal_listing=0" +# 09:28:53 > + +# MonetDB 5 server v11.18.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2012', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.333 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://robin-xps13:36187/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1669/.s.monetdb.36187 +# MonetDB/SQL module loaded + +Ready. + +# 09:28:53 > +# 09:28:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1669" "--port=36187" +# 09:28:53 > + +#select * from ft.func() as ftf; +% .ftf # table_name +% sch # name +% varchar # type +% 4 # length +[ "sys" ] +[ "tmp" ] +[ "json" ] +[ "bam" ] +[ "ft" ] +#drop function ft.func; +#drop schema ft; + +# 09:28:53 > +# 09:28:53 > "Done." +# 09:28:53 > diff --git a/sql/test/Dependencies/Tests/All b/sql/test/Dependencies/Tests/All --- a/sql/test/Dependencies/Tests/All +++ b/sql/test/Dependencies/Tests/All @@ -1,2 +1,3 @@ -Dependencies +!HAVE_SAMTOOLS?Dependencies +HAVE_SAMTOOLS?Dependencies_bam dependency_loop diff --git a/sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src b/sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src new file mode 100644 --- /dev/null +++ b/sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src @@ -0,0 +1,1 @@ +$RELSRCDIR/Dependencies.SQL.py \ No newline at end of file diff --git a/sql/test/Dependencies/Tests/Dependencies_bam.stable.err b/sql/test/Dependencies/Tests/Dependencies_bam.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/Dependencies/Tests/Dependencies_bam.stable.err @@ -0,0 +1,86 @@ +stderr of test 'Dependencies_bam` in directory 'sql/test/Dependencies` itself: + + +# 09:38:22 > +# 09:38:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38541" "--set" "mapi_usock=/var/tmp/mtest-6347/.s.monetdb.38541" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_test_Dependencies" "--set" "mal_listing=0" +# 09:38:22 > + +# builtin opt gdk_dbpath = /home/robin/MonetDB/PREFIX/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 = 38541 +# cmdline opt mapi_usock = /var/tmp/mtest-6347/.s.monetdb.38541 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /home/robin/MonetDB/PREFIX/var/MonetDB/mTests_sql_test_Dependencies +# cmdline opt mal_listing = 0 +# cmdline opt gdk_debug = 536870922 + +# 09:38:22 > +# 09:38:22 > "/usr/bin/python2" "Dependencies_bam.SQL.py" "Dependencies_bam" +# 09:38:22 > + +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP USER monetdb; +ERROR = !DROP USER: 'monetdb' owns a schema +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP SCHEMA test; +ERROR = !DROP SCHEMA: unable to drop schema 'test' (there are database objects which depend on it +MAPI = (monet_test) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = CREATE SCHEMA "test_2" AUTHORIZATION "public"; +ERROR = !CREATE SCHEMA: insufficient privileges for user 'monet_test' +MAPI = (monet_test) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP USER monetdb; +ERROR = !DROP USER: 'monetdb' owns a schema +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = CREATE INDEX id_age_index ON v1(id,age); +ERROR = !CREATE INDEX: cannot create index on view 'v1' +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = ALTER TABLE t1 DROP COLUMN id; +ERROR = !ALTER TABLE: cannot drop column 'id': there are database objects which depend on it +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = ALTER TABLE v1 DROP COLUMN age; +ERROR = !ALTER TABLE: cannot drop column from VIEW 'v1' +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = ALTER TABLE t2 ADD FOREIGN KEY(age_v1) REFERENCES v1(age); +ERROR = !CONSTRAINT FOREIGN KEY: could not find referenced PRIMARY KEY in table 'v1' +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP TABLE t1; +ERROR = !DROP TABLE: FOREIGN KEY t2.t2_id_t1_fkey depends on t1 +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP VIEW v1; +ERROR = !DROP VIEW: cannot drop view 'v1', there are database objects which depend on it +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP TABLE t2; +ERROR = !DROP TABLE: unable to drop table t2 (there are database objects which depend on it) +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP FUNCTION f1; +ERROR = !DROP FUNCTION: there are database objects dependent on function f1; +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP INDEX id_age_index; +ERROR = !DROP INDEX: no such index 'id_age_index' +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP VIEW v1; +ERROR = !DROP VIEW: cannot drop view 'v1', there are database objects which depend on it +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP TABLE t1; +ERROR = !DROP TABLE: unable to drop table t1 (there are database objects which depend on it) +MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +QUERY = DROP function f1; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list