Changeset: 3402e896fa18 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3402e896fa18 Added Files: sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.sql.in sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.err sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.out sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.sql.in sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.err sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.out Modified Files: sql/test/BugTracker-2013/Tests/All sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.sql.in sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.stable.out Branch: Oct2014 Log Message:
Split test into three with different conditionals. I have a system that does have bz2 but no gz support... diffs (288 lines): diff --git a/sql/test/BugTracker-2013/Tests/All b/sql/test/BugTracker-2013/Tests/All --- a/sql/test/BugTracker-2013/Tests/All +++ b/sql/test/BugTracker-2013/Tests/All @@ -45,6 +45,8 @@ like_pcre_or.Bug-3348 duplicate_column_name.Bug-3349 binary_copy_into.Bug-3345 copy-into-compressed.Bug-3351 +HAVE_LIBZ?copy-into-compressed-gz.Bug-3351 +HAVE_LIBBZ2?copy-into-compressed-bz2.Bug-3351 median.Bug-3352 check-constraint.Bug-3335 crash_after_creation_of_unique_key.Bug-3363 diff --git a/sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.sql.in b/sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.sql.in new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.sql.in @@ -0,0 +1,9 @@ +start transaction; + +create table test3351 (i integer); + +copy into test3351 from '$TSTSRCDIR/test3351.csv.bz2'; +select * from test3351; +delete from test3351; + +rollback; diff --git a/sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.err b/sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.err @@ -0,0 +1,37 @@ +stderr of test 'copy-into-compressed-bz2.Bug-3351` in directory 'sql/test/BugTracker-2013` itself: + + +# 09:47:23 > +# 09:47:23 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34634" "--set" "mapi_usock=/var/tmp/mtest-10351/.s.monetdb.34634" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 09:47:23 > + +# builtin opt gdk_dbpath = /ufs/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 = 34634 +# cmdline opt mapi_usock = /var/tmp/mtest-10351/.s.monetdb.34634 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013 +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 09:47:23 > +# 09:47:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10351" "--port=34634" +# 09:47:23 > + + +# 09:47:24 > +# 09:47:24 > "Done." +# 09:47:24 > + diff --git a/sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.out b/sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.out @@ -0,0 +1,49 @@ +stdout of test 'copy-into-compressed-bz2.Bug-3351` in directory 'sql/test/BugTracker-2013` itself: + + +# 09:47:23 > +# 09:47:23 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34634" "--set" "mapi_usock=/var/tmp/mtest-10351/.s.monetdb.34634" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 09:47:23 > + +# MonetDB 5 server v11.19.8 (hg id: 6e51939fcef0) +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2013', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.590 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2015 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:34634/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-10351/.s.monetdb.34634 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 09:47:23 > +# 09:47:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10351" "--port=34634" +# 09:47:23 > + +#start transaction; +#create table test3351 (i integer); +#copy into test3351 from '/net/madrid/export/scratch1/sjoerd/src/MonetDB/stable/sql/test/BugTracker-2013/Tests/test3351.csv.bz2'; +[ 5 ] +#select * from test3351; +% sys.test3351 # table_name +% i # name +% int # type +% 1 # length +[ 1 ] +[ 2 ] +[ 3 ] +[ 4 ] +[ 5 ] +#delete from test3351; +[ 5 ] +#rollback; + +# 09:47:24 > +# 09:47:24 > "Done." +# 09:47:24 > + diff --git a/sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.sql.in b/sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.sql.in new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.sql.in @@ -0,0 +1,9 @@ +start transaction; + +create table test3351 (i integer); + +copy into test3351 from '$TSTSRCDIR/test3351.csv.gz'; +select * from test3351; +delete from test3351; + +rollback; diff --git a/sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.err b/sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.err @@ -0,0 +1,37 @@ +stderr of test 'copy-into-compressed-gz.Bug-3351` in directory 'sql/test/BugTracker-2013` itself: + + +# 09:47:22 > +# 09:47:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34634" "--set" "mapi_usock=/var/tmp/mtest-10351/.s.monetdb.34634" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 09:47:22 > + +# builtin opt gdk_dbpath = /ufs/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 = 34634 +# cmdline opt mapi_usock = /var/tmp/mtest-10351/.s.monetdb.34634 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013 +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 09:47:23 > +# 09:47:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10351" "--port=34634" +# 09:47:23 > + + +# 09:47:23 > +# 09:47:23 > "Done." +# 09:47:23 > + diff --git a/sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.out b/sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.out @@ -0,0 +1,49 @@ +stdout of test 'copy-into-compressed-gz.Bug-3351` in directory 'sql/test/BugTracker-2013` itself: + + +# 09:47:22 > +# 09:47:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34634" "--set" "mapi_usock=/var/tmp/mtest-10351/.s.monetdb.34634" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 09:47:22 > + +# MonetDB 5 server v11.19.8 (hg id: 6e51939fcef0) +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2013', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.590 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2015 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:34634/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-10351/.s.monetdb.34634 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 09:47:23 > +# 09:47:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10351" "--port=34634" +# 09:47:23 > + +#start transaction; +#create table test3351 (i integer); +#copy into test3351 from '/net/madrid/export/scratch1/sjoerd/src/MonetDB/stable/sql/test/BugTracker-2013/Tests/test3351.csv.gz'; +[ 5 ] +#select * from test3351; +% sys.test3351 # table_name +% i # name +% int # type +% 1 # length +[ 1 ] +[ 2 ] +[ 3 ] +[ 4 ] +[ 5 ] +#delete from test3351; +[ 5 ] +#rollback; + +# 09:47:23 > +# 09:47:23 > "Done." +# 09:47:23 > + diff --git a/sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.sql.in b/sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.sql.in --- a/sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.sql.in +++ b/sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.sql.in @@ -6,12 +6,4 @@ copy into test3351 from '$TSTSRCDIR/test select * from test3351; delete from test3351; -copy into test3351 from '$TSTSRCDIR/test3351.csv.gz'; -select * from test3351; -delete from test3351; - -copy into test3351 from '$TSTSRCDIR/test3351.csv.bz2'; -select * from test3351; -delete from test3351; - rollback; diff --git a/sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.stable.out b/sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.stable.out --- a/sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.stable.out +++ b/sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.stable.out @@ -50,35 +50,7 @@ Ready. #start transaction; #create table test3351 (i integer); -#copy into test3351 from '/net/madrid/export/scratch2/sjoerd/src/MonetDB/stable/sql/test/BugTracker-2013/Tests/test3351.csv'; -[ 5 ] -#select * from test3351; -% sys.test3351 # table_name -% i # name -% int # type -% 1 # length -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -#delete from test3351; -[ 5 ] -#copy into test3351 from '/net/madrid/export/scratch2/sjoerd/src/MonetDB/stable/sql/test/BugTracker-2013/Tests/test3351.csv.gz'; -[ 5 ] -#select * from test3351; -% sys.test3351 # table_name -% i # name -% int # type -% 1 # length -[ 1 ] -[ 2 ] -[ 3 ] -[ 4 ] -[ 5 ] -#delete from test3351; -[ 5 ] -#copy into test3351 from '/net/madrid/export/scratch2/sjoerd/src/MonetDB/stable/sql/test/BugTracker-2013/Tests/test3351.csv.bz2'; +#copy into test3351 from '/net/madrid/export/scratch1/sjoerd/src/MonetDB/stable/sql/test/BugTracker-2013/Tests/test3351.csv'; [ 5 ] #select * from test3351; % sys.test3351 # table_name _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
