Changeset: 838c72a24995 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=838c72a24995 Added Files: sql/test/mosaic/Tests/session_exit.sql sql/test/mosaic/Tests/session_exit.stable.err sql/test/mosaic/Tests/session_exit.stable.out sql/test/mosaic/Tests/session_init.sql sql/test/mosaic/Tests/session_init.stable.err sql/test/mosaic/Tests/session_init.stable.out Modified Files: sql/test/mosaic/Tests/All Branch: mosaic Log Message:
Add session stop/restart on compressed data diffs (truncated from 921 to 300 lines): diff --git a/sql/test/mosaic/Tests/All b/sql/test/mosaic/Tests/All --- a/sql/test/mosaic/Tests/All +++ b/sql/test/mosaic/Tests/All @@ -3,3 +3,6 @@ compressionRLE xqueries xqueries_rle xqueries_delta + +session_init +session_exit diff --git a/sql/test/mosaic/Tests/session_exit.sql b/sql/test/mosaic/Tests/session_exit.sql new file mode 100644 --- /dev/null +++ b/sql/test/mosaic/Tests/session_exit.sql @@ -0,0 +1,24 @@ +set optimizer='sequential_pipe'; + +explain select * from tmp3; +select * from tmp3; + +alter table tmp3 alter column i set storage 'literal'; +alter table tmp3 alter column b set storage 'literal'; +alter table tmp3 alter column f set storage 'literal'; +explain select * from tmp3; +select * from tmp3; + +--select * from storage where "table" = 'tmp3'; +select count(*) from tmp3; + +alter table tmp3 alter column i set storage NULL; +alter table tmp3 alter column b set storage NULL; +alter table tmp3 alter column f set storage NULL; +explain select * from tmp3; +select * from tmp3; + +alter table tmp3 set read write; +select * from tmp3; + +drop table tmp3; diff --git a/sql/test/mosaic/Tests/session_exit.stable.err b/sql/test/mosaic/Tests/session_exit.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/mosaic/Tests/session_exit.stable.err @@ -0,0 +1,37 @@ +stderr of test 'session_exit` in directory 'sql/test/mosaic` itself: + + +# 16:53:28 > +# 16:53:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39906" "--set" "mapi_usock=/var/tmp/mtest-27036/.s.monetdb.39906" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_sql_test_mosaic" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 16:53:28 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/mosaic//Linux/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 = 39906 +# cmdline opt mapi_usock = /var/tmp/mtest-27036/.s.monetdb.39906 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_sql_test_mosaic +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 16:53:28 > +# 16:53:28 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-27036" "--port=39906" +# 16:53:28 > + + +# 16:53:28 > +# 16:53:28 > "Done." +# 16:53:28 > + diff --git a/sql/test/mosaic/Tests/session_exit.stable.out b/sql/test/mosaic/Tests/session_exit.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/mosaic/Tests/session_exit.stable.out @@ -0,0 +1,547 @@ +stdout of test 'session_exit` in directory 'sql/test/mosaic` itself: + + +# 16:53:28 > +# 16:53:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39906" "--set" "mapi_usock=/var/tmp/mtest-27036/.s.monetdb.39906" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_sql_test_mosaic" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 16:53:28 > + +# MonetDB 5 server v11.22.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_mosaic', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers 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://vienna.ins.cwi.nl:39906/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-27036/.s.monetdb.39906 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.8' +# Finished reading the write-ahead log 'sql_logs/sql/log.8' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 16:53:28 > +# 16:53:28 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-27036" "--port=39906" +# 16:53:28 > + +#set optimizer='sequential_pipe'; +#explain select * from tmp3; +% .explain # table_name +% mal # name +% clob # type +% 85 # length +function user.s2_1{autoCommit=true}():void; + X_57:void := querylog.define("explain select * from tmp3;","sequential_pipe",39); + X_20 := bat.new(nil:oid,nil:str); + X_28 := bat.append(X_20,"sys.tmp3"); + X_36 := bat.append(X_28,"sys.tmp3"); + X_43 := bat.append(X_36,"sys.tmp3"); + X_50 := bat.append(X_43,"sys.tmp3"); + X_23 := bat.new(nil:oid,nil:str); + X_30 := bat.append(X_23,"i"); + X_37 := bat.append(X_30,"b"); + X_44 := bat.append(X_37,"f"); + X_51 := bat.append(X_44,"t"); + X_24 := bat.new(nil:oid,nil:str); + X_31 := bat.append(X_24,"int"); + X_38 := bat.append(X_31,"boolean"); + X_45 := bat.append(X_38,"real"); + X_52 := bat.append(X_45,"timestamp"); + X_25 := bat.new(nil:oid,nil:int); + X_33 := bat.append(X_25,32); + X_40 := bat.append(X_33,1); + X_47 := bat.append(X_40,24); + X_54 := bat.append(X_47,7); + X_27 := bat.new(nil:oid,nil:int); + X_35 := bat.append(X_27,0); + X_42 := bat.append(X_35,0); + X_49 := bat.append(X_42,0); + X_56 := bat.append(X_49,0); + X_2 := sql.mvc(); + X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp3"); + X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp3","i",0); + X_9 := mosaic.leftfetchjoin(X_3,X_6); + X_10:bat[:oid,:bit] := sql.bind(X_2,"sys","tmp3","b",0); + X_12 := mosaic.leftfetchjoin(X_3,X_10); + X_13:bat[:oid,:flt] := sql.bind(X_2,"sys","tmp3","f",0); + X_15 := mosaic.leftfetchjoin(X_3,X_13); + X_16:bat[:oid,:timestamp] := sql.bind(X_2,"sys","tmp3","t",0); + X_18 := mosaic.leftfetchjoin(X_3,X_16); + sql.resultSet(X_50,X_51,X_52,X_54,X_56,X_9,X_12,X_15,X_18); +end user.s2_1; +#select * from tmp3; +% sys.tmp3, sys.tmp3, sys.tmp3, sys.tmp3 # table_name +% i, b, f, t # name +% int, boolean, real, timestamp # type +% 2, 5, 15, 26 # length +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 2, false, 0.314, 2014-08-23 11:34:54.000000 ] +[ 3, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 2, false, 0.314, 2014-08-23 11:34:54.000000 ] +[ 3, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 2, false, 0.314, 2014-08-23 11:34:54.000000 ] +[ 3, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 0, false, 0.316, 2014-08-23 11:34:54.000000 ] +[ 5, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 6, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 7, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 8, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 9, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 10, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 1, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 2, false, 0.314, 2014-08-23 11:34:54.000000 ] +[ 3, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 2, false, 0.314, 2014-08-23 11:34:54.000000 ] +[ 3, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 2, false, 0.314, 2014-08-23 11:34:54.000000 ] +[ 3, true, 0.314, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 4, true, 0.316, 2014-08-23 11:34:54.000000 ] +[ 0, false, 0.316, 2014-08-23 11:34:54.000000 ] +[ 5, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 6, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 7, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 8, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 9, false, 0.317, 2014-08-23 11:34:54.000000 ] +[ 10, false, 0.317, 2014-08-23 11:34:54.000000 ] +#alter table tmp3 alter column i set storage 'literal'; +#alter table tmp3 alter column b set storage 'literal'; +#alter table tmp3 alter column f set storage 'literal'; +#explain select * from tmp3; +% .explain # table_name +% mal # name +% clob # type +% 85 # length +function user.s6_1{autoCommit=true}():void; + X_57:void := querylog.define("explain select * from tmp3;","sequential_pipe",39); + X_20 := bat.new(nil:oid,nil:str); + X_28 := bat.append(X_20,"sys.tmp3"); + X_36 := bat.append(X_28,"sys.tmp3"); + X_43 := bat.append(X_36,"sys.tmp3"); + X_50 := bat.append(X_43,"sys.tmp3"); + X_23 := bat.new(nil:oid,nil:str); + X_30 := bat.append(X_23,"i"); + X_37 := bat.append(X_30,"b"); + X_44 := bat.append(X_37,"f"); + X_51 := bat.append(X_44,"t"); + X_24 := bat.new(nil:oid,nil:str); + X_31 := bat.append(X_24,"int"); + X_38 := bat.append(X_31,"boolean"); + X_45 := bat.append(X_38,"real"); + X_52 := bat.append(X_45,"timestamp"); + X_25 := bat.new(nil:oid,nil:int); + X_33 := bat.append(X_25,32); + X_40 := bat.append(X_33,1); + X_47 := bat.append(X_40,24); + X_54 := bat.append(X_47,7); + X_27 := bat.new(nil:oid,nil:int); + X_35 := bat.append(X_27,0); + X_42 := bat.append(X_35,0); + X_49 := bat.append(X_42,0); + X_56 := bat.append(X_49,0); + X_2 := sql.mvc(); + X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp3"); + X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp3","i",0); + X_9 := mosaic.leftfetchjoin(X_3,X_6); + X_10:bat[:oid,:bit] := sql.bind(X_2,"sys","tmp3","b",0); + X_12 := mosaic.leftfetchjoin(X_3,X_10); + X_13:bat[:oid,:flt] := sql.bind(X_2,"sys","tmp3","f",0); + X_15 := mosaic.leftfetchjoin(X_3,X_13); + X_16:bat[:oid,:timestamp] := sql.bind(X_2,"sys","tmp3","t",0); + X_18 := mosaic.leftfetchjoin(X_3,X_16); + sql.resultSet(X_50,X_51,X_52,X_54,X_56,X_9,X_12,X_15,X_18); +end user.s6_1; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
