Changeset: f47ed8756087 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f47ed8756087 Modified Files: sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out Branch: default Log Message:
Reapproved tests: they have one more line of output. diffs (truncated from 322 to 300 lines): diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out --- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out +++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out @@ -1,94 +1,39 @@ stdout of test 'explain.SF-1739353` in directory 'sql/test/BugTracker` itself: -# 15:15:36 > -# 15:15:36 > mserver5 "--config=/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin" --set "gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=33159 --set xrpc_port=45591 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 15:15:36 > +# 15:11:17 > +# 15:11:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33800" "--set" "mapi_usock=/var/tmp/mtest-7180/.s.monetdb.33800" "--set" "monet_prompt=" "--forcemito" "--dbpath=/ufs/sjoerd/@Monet-virgin/var/MonetDB/mTests_sql_test_BugTracker" +# 15:11:17 > -# 12:04:36 > -# 12:04:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39801" "--set" "mapi_usock=/var/tmp/mtest-31630/.s.monetdb.39801" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker" "--set" "embedded_r=yes" "--set" "embedded_py=true" -# 12:04:36 > - -# MonetDB 5 server v11.24.0 +# MonetDB 5 server v11.28.0 (hg id: 623015a562d3) # This is an unreleased version # Serving database 'mTests_sql_test_BugTracker', using 8 threads # Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers -# Found 15.589 GiB available main-memory. +# Found 62.701 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://toulouse.da.cwi.nl:39801/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-31630/.s.monetdb.39801 +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://methuselah.da.cwi.nl:33800/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-7180/.s.monetdb.33800 # MonetDB/GIS module loaded # MonetDB/SQL module loaded -# MonetDB/Python module loaded -# MonetDB/R 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: 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_gsl.sql -# loading sql script: 46_profiler.sql -# loading sql script: 51_sys_schema_extension.sql -# loading sql script: 72_fits.sql -# loading sql script: 74_netcdf.sql -# loading sql script: 75_lidar.sql -# loading sql script: 75_shp.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: 85_bam.sql -# loading sql script: 90_generator.sql -# loading sql script: 90_generator_hge.sql -# loading sql script: 99_system.sql -# 12:04:37 > -# 12:04:37 > "./explain.SF-1739353.SQL.sh" "explain.SF-1739353" -# 12:04:37 > +# 15:11:18 > +# 15:11:18 > "./explain.SF-1739353.SQL.sh" "explain.SF-1739353" +# 15:11:18 > -# 12:04:37 > -# 12:04:37 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h toulouse -p 39801 -d mTests_sql_test_BugTracker -f "../../../../../dev/sql/test/BugTracker/Tests/explain.SF-1739353-data.sql" -# 12:04:37 > - -# 11:07:50 > -# 11:07:50 > "./explain.SF-1739353.SQL.sh" "explain.SF-1739353" -# 11:07:50 > - - -# 11:07:50 > -# 11:07:50 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h localhost -p 33313 -d mTests_sql_test_BugTracker -f "../../../../../../../data/MonetDB/sql/test/BugTracker/Tests/explain.SF-1739353-data.sql" -# 11:07:50 > +# 15:11:18 > +# 15:11:18 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h methuselah -p 33800 -d mTests_sql_test_BugTracker -f "../../../../../../../../scratch1/sjoerd/src/MonetDB/virgin/sql/test/BugTracker/Tests/explain.SF-1739353-data.sql" +# 15:11:18 > Operation successful +-----------------------------------------------------------------------------------------------------------+ -| mal | +| mal | +===========================================================================================================+ -| function user.s4_1():void; | +| function user.s4_1():void; | | X_1:void := querylog.define("explain select \"name\" from \"tables\"\n;", "sequential_pipe", 36:int); | | X_35:bat[:str] := bat.new(nil:str); | | X_4 := sql.mvc(); | @@ -109,7 +54,7 @@ Operation successful | X_34 := algebra.projection(C_31, X_33); | | X_37 := bat.append(X_35, X_29, true); | | X_39 := bat.append(X_37, X_34, true); | -| X_41 := bat.new(nil:str); | +| X_41 := bat.new(nil:str); | | X_46 := bat.new(nil:int); | | X_44 := bat.new(nil:int); | | X_43 := bat.new(nil:str); | @@ -120,33 +65,34 @@ Operation successful | X_53 := bat.append(X_44, 1024:int); | | X_55 := bat.append(X_46, 0:int); | | sql.resultSet(X_47, X_49, X_51, X_53, X_55, X_39); | -| end user.s4_1; | -| #inline actions= 0 time=1 usec | -| #remap actions= 0 time=2 usec | -| #costmodel actions= 1 time=2 usec | -| #coercion actions= 1 time=6 usec | -| #evaluate actions= 0 time=3 usec | -| #emptybind actions= 0 time=0 usec | -| #pushselect actions= 5 time=26 usec | -| #aliases actions= 2 time=8 usec | -| #mergetable actions= 0 time=30 usec | -| #deadcode actions= 3 time=7 usec | +| end user.s4_1; | +| #inline actions= 0 time=1 usec | +| #remap actions= 0 time=1 usec | +| #costmodel actions= 1 time=1 usec | +| #coercion actions= 1 time=2 usec | +| #evaluate actions= 0 time=1 usec | +| #emptybind actions= 0 time=1 usec | +| #pushselect actions= 5 time=12 usec | +| #aliases actions= 2 time=3 usec | +| #mergetable actions= 0 time=18 usec | +| #deadcode actions= 3 time=3 usec | | #aliases actions= 0 time=0 usec | -| #constants actions= 2 time=7 usec | -| #commonTerms actions= 0 time=6 usec | -| #projectionpath actions= 0 time=4 usec | -| #reorder actions= 1 time=24 usec | -| #deadcode actions= 0 time=5 usec | +| #constants actions= 2 time=3 usec | +| #commonTerms actions= 0 time=3 usec | +| #projectionpath actions= 0 time=1 usec | +| #reorder actions= 1 time=10 usec | +| #deadcode actions= 0 time=3 usec | | #matpack actions= 0 time=0 usec | | #multiplex actions= 0 time=1 usec | -| #profiler actions= 1 time=1 usec | -| #candidates actions= 1 time=1 usec | -| #garbagecollector actions= 1 time=41 usec | -| #total actions=23 time=259 usec | +| #profiler actions=1 time=1 usec | +| #candidates actions=1 time=0 usec | +| #wlc actions= 0 time=0 usec | +| #garbagecollector actions= 1 time=22 usec | +| #total actions=24 time=127 usec | +-----------------------------------------------------------------------------------------------------------+ -55 rows +56 rows -# 10:24:50 > -# 10:24:50 > "Done." -# 10:24:50 > +# 15:11:18 > +# 15:11:18 > "Done." +# 15:11:18 > diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out --- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out +++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out @@ -1,39 +1,49 @@ stdout of test 'jdbc_no_debug.SF-1739356` in directory 'sql/test/BugTracker` itself: -# 13:44:44 > -# 13:44:44 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=36629 --set xrpc_port=45999 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 13:44:44 > +# 15:14:32 > +# 15:14:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34637" "--set" "mapi_usock=/var/tmp/mtest-10846/.s.monetdb.34637" "--set" "monet_prompt=" "--forcemito" "--dbpath=/ufs/sjoerd/@Monet-virgin/var/MonetDB/mTests_sql_test_BugTracker" +# 15:14:32 > -# MonetDB server v5.12.0, based on kernel v1.30.0 -# Serving database 'mTests_src_test_BugTracker', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# MonetDB 5 server v11.28.0 (hg id: 623015a562d3) +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 62.701 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:36629/ -# MonetDB/SQL module v2.30.0 loaded +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://methuselah.da.cwi.nl:34637/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-10846/.s.monetdb.34637 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded Ready. +# 15:14:32 > +# 15:14:32 > "./jdbc_no_debug.SF-1739356.SQL.sh" "jdbc_no_debug.SF-1739356" +# 15:14:32 > +# 15:14:32 > +# 15:14:32 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h methuselah -p 34637 -d mTests_sql_test_BugTracker -f "../../../../../../../../scratch1/sjoerd/src/MonetDB/virgin/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql" +# 15:14:32 > +----------------------------------------------------------------------------+ -| rel | +| rel | +============================================================================+ -| project ( | -| | group by ( | -| | | union ( | -| | | | group by ( | -| | | | | project ( | -| | | | | | select ( | +| project ( | +| | group by ( | +| | | union ( | +| | | | group by ( | +| | | | | project ( | +| | | | | | select ( | | | | | | | | table(sys._tables) [ "_tables"."id", "_tables"."type" ] COUNT | | | | | | | ) [ "_tables"."type" != smallint "2" ] | | | | | | ) [ "_tables"."id" as "tables"."id" ] | | | | | ) [ ] [ sys.count() NOT NULL as "L41"."L41" ], | -| | | | group by ( | -| | | | | project ( | +| | | | group by ( | +| | | | | project ( | | | | | | | table(tmp._tables) [ "_tables"."id" ] COUNT | | | | | | ) [ "_tables"."id" as "tables"."id" ] | | | | | ) [ ] [ sys.count() NOT NULL as "L41"."L41" ] | @@ -44,9 +54,9 @@ Ready. 18 rows Operation successful +-------------------------------------------------------------------------------------------------------+ -| mal | +| mal | +=======================================================================================================+ -| function user.s4_1():void; | +| function user.s4_1():void; | | X_1:void := querylog.define("explain select count(*) from tables\n;", "sequential_pipe", 30:int); | | X_38:bat[:lng] := bat.new(nil:lng); | | X_4 := sql.mvc(); | @@ -72,33 +82,34 @@ Operation successful | X_42 := bat.append(X_40, X_36, true); | | X_43:lng := aggr.sum(X_42); | | sql.resultSet(".L42", "L41", "bigint", 64:int, 0:int, 7:int, X_43); | -| end user.s4_1; | -| #inline actions= 0 time=0 usec | -| #remap actions= 0 time=1 usec | -| #costmodel actions= 1 time=1 usec | -| #coercion actions= 1 time=3 usec | +| end user.s4_1; | +| #inline actions= 0 time=0 usec | +| #remap actions= 0 time=0 usec | +| #costmodel actions= 1 time=0 usec | +| #coercion actions= 1 time=1 usec | | #evaluate actions= 0 time=1 usec | | #emptybind actions= 0 time=0 usec | -| #pushselect actions= 5 time=15 usec | -| #aliases actions= 2 time=4 usec | -| #mergetable actions= 0 time=18 usec | -| #deadcode actions= 3 time=4 usec | +| #pushselect actions= 5 time=11 usec | +| #aliases actions= 2 time=3 usec | +| #mergetable actions= 0 time=11 usec | +| #deadcode actions= 3 time=2 usec | | #aliases actions= 0 time=0 usec | -| #constants actions= 1 time=4 usec | +| #constants actions= 1 time=2 usec | | #commonTerms actions= 0 time=3 usec | -| #projectionpath actions= 0 time=2 usec | -| #reorder actions= 1 time=13 usec | -| #deadcode actions= 0 time=3 usec | +| #projectionpath actions= 0 time=1 usec | +| #reorder actions= 1 time=9 usec | _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
