Changeset: 20fd18109415 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20fd18109415 Added Files: sql/test/Tests/copy-from-compressed.csv.bz2 sql/test/Tests/copy-from-compressed.csv.gz sql/test/Tests/copy-from-compressed.csv.raw sql/test/Tests/copy-from-compressed.sql.in sql/test/Tests/copy-from-compressed.stable.err sql/test/Tests/copy-from-compressed.stable.out Modified Files: sql/test/Tests/All Branch: Mar2018 Log Message:
Add test for loading compressed data diffs (198 lines): diff --git a/sql/test/Tests/All b/sql/test/Tests/All --- a/sql/test/Tests/All +++ b/sql/test/Tests/All @@ -117,6 +117,7 @@ str-trim alastair_udf_mergetable_bug copy-into-fwf +copy-from-compressed truncate-statements truncate-statements-extra diff --git a/sql/test/Tests/copy-from-compressed.csv.bz2 b/sql/test/Tests/copy-from-compressed.csv.bz2 new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6aff78f89e1ed0331928496ade26fcf72826f7f0 GIT binary patch literal 52 zc${;J%CIzaj8qGboa+3Qmw|!lW&?u&1B(EIfP#a70)rtB!)3RuEKUpY?wv|=G(5Z( I{%UIg0A4)~vj6}9 diff --git a/sql/test/Tests/copy-from-compressed.csv.gz b/sql/test/Tests/copy-from-compressed.csv.gz new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ec5f9562b5a480a2fc1894398f8b8f35418c8b9b GIT binary patch literal 53 zc$|~(=HNK7;!_k8b8>z`rEXeLey(nEer`cgYH@LDie7SY8H4xwQ#uzs*FR!n*!0O| JGY10$0{|u46f*z- diff --git a/sql/test/Tests/copy-from-compressed.csv.raw b/sql/test/Tests/copy-from-compressed.csv.raw new file mode 100644 --- /dev/null +++ b/sql/test/Tests/copy-from-compressed.csv.raw @@ -0,0 +1,1 @@ +no compression,- diff --git a/sql/test/Tests/copy-from-compressed.sql.in b/sql/test/Tests/copy-from-compressed.sql.in new file mode 100644 --- /dev/null +++ b/sql/test/Tests/copy-from-compressed.sql.in @@ -0,0 +1,22 @@ +create table compression_schemes ( + name varchar(20), + extension varchar(5) +); + + +copy into compression_schemes +from '$QTSTSRCDIR/copy-from-compressed.csv.raw' +using delimiters ',', '\n'; + +copy into compression_schemes +from '$QTSTSRCDIR/copy-from-compressed.csv.gz' +using delimiters ',', '\n'; + +copy into compression_schemes +from '$QTSTSRCDIR/copy-from-compressed.csv.bz2' +using delimiters ',', '\n'; + + +select * from compression_schemes order by extension; + +drop table compression_schemes; diff --git a/sql/test/Tests/copy-from-compressed.stable.err b/sql/test/Tests/copy-from-compressed.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/Tests/copy-from-compressed.stable.err @@ -0,0 +1,35 @@ +stderr of test 'copy-from-compressed` in directory 'sql/test` itself: + + +# 10:04:19 > +# 10:04:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31496" "--set" "mapi_usock=/var/tmp/mtest-46965/.s.monetdb.31496" "--set" "monet_prompt=" "--forcemito" "--dbpath=/Users/joeri/monets/copyfromxz/var/MonetDB/mTests_sql_test" "--set" "embedded_c=true" +# 10:04:19 > + +# builtin opt gdk_dbpath = /Users/joeri/monets/copyfromxz/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 = 31496 +# cmdline opt mapi_usock = /var/tmp/mtest-46965/.s.monetdb.31496 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /Users/joeri/monets/copyfromxz/var/MonetDB/mTests_sql_test +# cmdline opt embedded_c = true +# cmdline opt gdk_debug = 553648138 + +# 10:04:19 > +# 10:04:19 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-46965" "--port=31496" +# 10:04:19 > + + +# 10:04:20 > +# 10:04:20 > "Done." +# 10:04:20 > + diff --git a/sql/test/Tests/copy-from-compressed.stable.out b/sql/test/Tests/copy-from-compressed.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/Tests/copy-from-compressed.stable.out @@ -0,0 +1,93 @@ +stdout of test 'copy-from-compressed` in directory 'sql/test` itself: + + +# 10:04:19 > +# 10:04:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31496" "--set" "mapi_usock=/var/tmp/mtest-46965/.s.monetdb.31496" "--set" "monet_prompt=" "--forcemito" "--dbpath=/Users/joeri/monets/copyfromxz/var/MonetDB/mTests_sql_test" "--set" "embedded_c=true" +# 10:04:19 > + +# MonetDB 5 server v11.29.4 +# This is an unreleased version +# Serving database 'mTests_sql_test', using 8 threads +# Compiled for x86_64-apple-darwin17.5.0/64bit with 128bit integers +# Found 16.000 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://MacBook-Pro.local:31496/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-46965/.s.monetdb.31496 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.sql +# loading sql script: 18_index.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 21_dependency_views.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_profiler.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 60_wlcr.sql +# loading sql script: 72_fits.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql + +# 10:04:19 > +# 10:04:19 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-46965" "--port=31496" +# 10:04:19 > + +#create table compression_schemes ( +# name varchar(20), +# extension varchar(5) +#); +#copy into compression_schemes +#from '/Users/joeri/monets/copyfromxz/src/sql/test/Tests/copy-from-compressed.csv.raw' +#using delimiters ',', '\n'; +[ 1 ] +#copy into compression_schemes +#from '/Users/joeri/monets/copyfromxz/src/sql/test/Tests/copy-from-compressed.csv.gz' +#using delimiters ',', '\n'; +[ 1 ] +#copy into compression_schemes +#from '/Users/joeri/monets/copyfromxz/src/sql/test/Tests/copy-from-compressed.csv.bz2' +#using delimiters ',', '\n'; +[ 1 ] +#select * from compression_schemes order by extension; +% sys.compression_schemes, sys.compression_schemes # table_name +% name, extension # name +% varchar, varchar # type +% 14, 3 # length +[ "no compression", "-" ] +[ "bzip2", "bz2" ] +[ "gzip", "gz" ] +#drop table compression_schemes; + +# 10:04:20 > +# 10:04:20 > "Done." +# 10:04:20 > + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list