Changeset: 2955abee0611 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2955abee0611 Removed Files: sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Darwin.32bit sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows Modified Files: sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit Branch: Feb2013 Log Message:
merged diffs (184 lines): diff --git a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Darwin.32bit b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Darwin.32bit deleted file mode 100644 --- a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Darwin.32bit +++ /dev/null @@ -1,48 +0,0 @@ -stdout of test 'leaks` in directory 'sql/benchmarks/tpch/fileleak` itself: - - -# 16:01:25 > -# 16:01:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35740" "--set" "mapi_usock=/var/tmp/mtest-3945/.s.monetdb.35740" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak" "--set" "mal_listing=0" -# 16:01:25 > - -# MonetDB 5 server v11.15.12 -# This is an unreleased version -# Serving database 'mTests_sql_benchmarks_tpch_fileleak', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 3.775 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://niels.nesco.mine.nu:35740/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-3945/.s.monetdb.35740 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded - -Ready. - -# 16:01:26 > -# 16:01:26 > "/usr/bin/python2" "leaks.SQL.py" "leaks" -# 16:01:26 > - -(u'10/1050', 0, 0) -(u'10/1051', 0, 0) -(u'10/1052', 0, 0) -(u'10/1053', 0, 0) -(u'10/1054', 0, 0) -(u'10/1055', 0, 0) -(u'10/1056', 0, 0) -(u'10/1057', 0, 0) -(u'10/1060', 0, 0) -(u'10/1061', 0, 0) -(u'10/1062', 0, 0) -(u'10/1063', 0, 0) -(u'10/1064', 0, 0) -(u'10/1065', 0, 0) -(u'10/1066', 0, 0) -(u'10/1067', 0, 0) - -# 16:01:26 > -# 16:01:26 > "Done." -# 16:01:26 > - diff --git a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows deleted file mode 100644 --- a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows +++ /dev/null @@ -1,48 +0,0 @@ -stdout of test 'leaks` in directory 'sql/benchmarks/tpch/fileleak` itself: - - -# 16:01:25 > -# 16:01:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35740" "--set" "mapi_usock=/var/tmp/mtest-3945/.s.monetdb.35740" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak" "--set" "mal_listing=0" -# 16:01:25 > - -# MonetDB 5 server v11.15.12 -# This is an unreleased version -# Serving database 'mTests_sql_benchmarks_tpch_fileleak', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 3.775 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://niels.nesco.mine.nu:35740/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-3945/.s.monetdb.35740 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded - -Ready. - -# 16:01:26 > -# 16:01:26 > "/usr/bin/python2" "leaks.SQL.py" "leaks" -# 16:01:26 > - -(u'10\\1050', 0, 0) -(u'10\\1051', 0, 0) -(u'10\\1052', 0, 0) -(u'10\\1053', 0, 0) -(u'10\\1054', 0, 0) -(u'10\\1055', 0, 0) -(u'10\\1056', 0, 0) -(u'10\\1057', 0, 0) -(u'10\\1060', 0, 0) -(u'10\\1061', 0, 0) -(u'10\\1062', 0, 0) -(u'10\\1063', 0, 0) -(u'10\\1064', 0, 0) -(u'10\\1065', 0, 0) -(u'10\\1066', 0, 0) -(u'10\\1067', 0, 0) - -# 16:01:26 > -# 16:01:26 > "Done." -# 16:01:26 > - diff --git a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit --- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit +++ b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit @@ -28,7 +28,8 @@ Ready. % .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name % type, digits, scale, schema, table, column # name % varchar, int, int, str, str, str # type -% 3, 2, 1, 0, 0, 0 # length +% 3, 3, 1, 0, 2, 2 # length +[ "int", 32, 0, "", "rr", "id" ] [ "wrd", 32, 0, NULL, NULL, NULL ] #exec 3 (1); % sys.rr # table_name @@ -36,8 +37,61 @@ Ready. % int # type % 1 # length [ 1 ] +#drop table rr; +#prepare select * from tables limit 42; +#prepare select * from tables limit 42; +% .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name +% type, digits, scale, schema, table, column # name +% varchar, int, int, str, str, str # type +% 8, 4, 1, 0, 6, 13 # length +[ "int", 32, 0, "", "tables", "id" ] +[ "varchar", 1024, 0, "", "tables", "name" ] +[ "int", 32, 0, "", "tables", "schema_id" ] +[ "varchar", 2048, 0, "", "tables", "query" ] +[ "smallint", 16, 0, "", "tables", "type" ] +[ "boolean", 1, 0, "", "tables", "system" ] +[ "smallint", 16, 0, "", "tables", "commit_action" ] +[ "boolean", 1, 0, "", "tables", "readonly" ] +[ "tinyint", 8, 0, "", "tables", "temporary" ] +#exec 2 (); +% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name +% id, name, schema_id, query, type, system, commit_action, readonly, temporary # name +% int, varchar, int, varchar, smallint, boolean, smallint, boolean, tinyint # type +% 4, 17, 4, 496, 1, 5, 1, 5, 1 # length +[ 2001, "schemas", 2000, NULL, 0, true, 0, false, 0 ] +[ 2006, "types", 2000, NULL, 0, true, 0, false, 0 ] +[ 2015, "functions", 2000, NULL, 0, true, 0, false, 0 ] +[ 2024, "args", 2000, NULL, 0, true, 0, false, 0 ] +[ 2032, "sequences", 2000, NULL, 0, true, 0, false, 0 ] +[ 2042, "dependencies", 2000, NULL, 0, true, 0, false, 0 ] +[ 2046, "connections", 2000, NULL, 0, true, 0, false, 0 ] +[ 2055, "_tables", 2000, NULL, 0, true, 0, false, 0 ] +[ 2064, "_columns", 2000, NULL, 0, true, 0, false, 0 ] +[ 2075, "keys", 2000, NULL, 0, true, 0, false, 0 ] +[ 2082, "idxs", 2000, NULL, 0, true, 0, false, 0 ] +[ 2087, "triggers", 2000, NULL, 0, true, 0, false, 0 ] +[ 2098, "objects", 2000, NULL, 0, true, 0, false, 0 ] +[ 2103, "_tables", 2102, NULL, 0, true, 2, false, 0 ] +[ 2112, "_columns", 2102, NULL, 0, true, 2, false, 0 ] +[ 2123, "keys", 2102, NULL, 0, true, 2, false, 0 ] +[ 2130, "idxs", 2102, NULL, 0, true, 2, false, 0 ] +[ 2135, "triggers", 2102, NULL, 0, true, 2, false, 0 ] +[ 2146, "objects", 2102, NULL, 0, true, 2, false, 0 ] +[ 5075, "tables", 2000, "SELECT * FROM (SELECT p.*, 0 AS \"temporary\" FROM \"sys\".\"_tables\" AS p UNION ALL SELECT t.*, 1 AS \"temporary\" FROM \"tmp\".\"_tables\" AS t) AS tables where tables.type <> 2;", 1, true, 0, false, 0 ] +[ 5085, "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1, true, 0, false, 0 ] +[ 5105, "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] +[ 5113, "users", 2000, "SELECT u.\"name\" AS \"name\", ui.\"fullname\", ui.\"default_schema\" FROM db_users() AS u LEFT JOIN \"sys\".\"db_user_info\" AS ui ON u.\"name\" = ui.\"name\" ;", 1, true, 0, false, 0 ] +[ 5117, "user_role", 2000, NULL, 0, true, 0, false, 0 ] +[ 5120, "auths", 2000, NULL, 0, true, 0, false, 0 ] +[ 5124, "privileges", 2000, NULL, 0, true, 0, false, 0 ] +[ 5277, "queryhistory", 2000, NULL, 0, true, 0, false, 0 ] +[ 5291, "callhistory", 2000, NULL, 0, true, 0, false, 0 ] +[ 5308, "querylog", 2000, "create view querylog as\nselect qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id = ql.id;", 1, true, 0, false, 0 ] +[ 6074, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] +[ 6115, "tablestoragemodel", 2000, "-- A summary of the table storage requirement is is available as a table view.\n-- The auxillary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select \"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1, true, 0, false, 0 ] +[ 6137, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -# 08:45:11 > -# 08:45:11 > Done. -# 08:45:11 > +# 11:49:44 > +# 11:49:44 > "Done." +# 11:49:44 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
