Changeset: a95ebdfb2c99 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a95ebdfb2c99 Modified Files: clients/mapiclient/Tests/stethoscope--help.stable.err monetdb5/mal/Tests/All monetdb5/optimizer/Tests/All sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit Branch: default Log Message:
merged diffs (189 lines): diff --git a/clients/mapiclient/Tests/stethoscope--help.stable.err b/clients/mapiclient/Tests/stethoscope--help.stable.err --- a/clients/mapiclient/Tests/stethoscope--help.stable.err +++ b/clients/mapiclient/Tests/stethoscope--help.stable.err @@ -17,7 +17,7 @@ stethoscope [options] [dbname] +[trace o -h | --host=<hostname> -? | --help -The trace options (default 'ISTest'): +The trace options (default 'ISTestn'): S = monitor start of instruction profiling a = aggregate clock ticks per instruction e = event counter @@ -29,6 +29,7 @@ The trace options (default 'ISTest'): c = cpu statistics (utime,ctime,stime,cstime) m = rss memory as provided by OS (in MB) M = memory footprint of non-persistent objects + n = numa intra socket data flow r = block reads w = block writes b = bytes read/written diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All --- a/monetdb5/mal/Tests/All +++ b/monetdb5/mal/Tests/All @@ -134,7 +134,6 @@ tst256 tst260 tst2570 # tst265 -- windowsum and slidingsum have been removed -tst267 # opens /tmp/MonetEvents, i.e. not on Windows: NOT_WIN32?tst270 tst272 diff --git a/monetdb5/optimizer/Tests/All b/monetdb5/optimizer/Tests/All --- a/monetdb5/optimizer/Tests/All +++ b/monetdb5/optimizer/Tests/All @@ -18,10 +18,7 @@ tst4630 tst4700 tst4701 # tst4730 -- uses group.refine -tst4800 -tst4801 tst4820 -tst4900 qep00 qep01 @@ -81,13 +78,11 @@ CXerror1 #the remainder are snippets used in the reference manual CMexample CRexample -AEexample ARexample DCexample DCexample2 ESexample FTexample -GCexample GCexample01 CXexample JPexample 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 @@ -16,12 +16,64 @@ stdout of test 'limit_in_prepare.Bug-255 # MonetDB/SQL module v2.38.0 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: 19_cluster.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: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 39_analytics.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 41_jsonstore.sql +# loading sql script: 45_uuid.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 85_bam.sql +# loading sql script: 99_system.sql +# 22:28:06 > +# 22:28:06 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10173" "--port=36549" +# 22:28:06 > -# 08:45:11 > -# 08:45:11 > mclient -lsql -ftest -i -e --host=alf --port=35663 -# 08:45:11 > - +#CREATE TABLE "sys"."tbls" ( +# "id" INTEGER, +# "name" VARCHAR(1024), +# "schema_id" INTEGER, +# "query" VARCHAR(2048), +# "type" SMALLINT, +# "system" BOOLEAN, +# "commit_action" SMALLINT, +# "readonly" BOOLEAN, +# "temporary" SMALLINT +#); +#COPY 40 RECORDS INTO "sys"."tbls" FROM stdin USING DELIMITERS '\t','\n','"'; +#2001 "schemas" 2000 NULL 0 true 0 false 0 +#2007 "types" 2000 NULL 0 true 0 false 0 +#2016 "functions" 2000 NULL 0 true 0 false 0 +#2027 "args" 2000 NULL 0 true 0 false 0 +#2036 "sequences" 2000 NULL 0 true 0 false 0 +#2046 "dependencies" 2000 NULL 0 true 0 false 0 +#2050 "connections" 2000 NULL 0 true 0 false 0 +#2059 "_tables" 2000 NULL 0 true 0 false 0 +#2068 "_columns" 2000 NULL 0 true 0 false 0 +#2079 "keys" 2000 NULL 0 true 0 false 0 +#2086 "idxs" 2000 NULL 0 true 0 false 0 +[ 40 ] +#create table rr (id int); +#insert into rr values (1),(2),(3); [ 3 ] #prepare select * from rr limit ?; #prepare select * from rr limit ?; @@ -43,20 +95,20 @@ Ready. % .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 -[ "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 # table_name +% 8, 4, 1, 0, 4, 13 # length +[ "varchar", 1024, 0, "", "tbls", "name" ] +[ "int", 32, 0, "", "tbls", "schema_id" ] +[ "varchar", 2048, 0, "", "tbls", "query" ] +[ "smallint", 16, 0, "", "tbls", "type" ] +[ "boolean", 1, 0, "", "tbls", "system" ] +[ "smallint", 16, 0, "", "tbls", "commit_action" ] +[ "boolean", 1, 0, "", "tbls", "readonly" ] +[ "smallint", 16, 0, "", "tbls", "temporary" ] +#exec 7 (); +% sys.tbls, sys.tbls, sys.tbls, sys.tbls, sys.tbls, sys.tbls, sys.tbls, sys.tbls # table_name % name, schema_id, query, type, system, commit_action, readonly, temporary # name -% varchar, int, varchar, smallint, boolean, smallint, boolean, tinyint # type -% 17, 4, 522, 1, 5, 1, 5, 1 # length +% varchar, int, varchar, smallint, boolean, smallint, boolean, smallint # type +% 12, 4, 169, 1, 5, 1, 5, 1 # length [ "schemas", 2000, NULL, 0, true, 0, false, 0 ] [ "types", 2000, NULL, 0, true, 0, false, 0 ] [ "functions", 2000, NULL, 0, true, 0, false, 0 ] @@ -81,22 +133,7 @@ Ready. [ "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] [ "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 ] [ "user_role", 2000, NULL, 0, true, 0, false, 0 ] -[ "auths", 2000, NULL, 0, true, 0, false, 0 ] -[ "privileges", 2000, NULL, 0, true, 0, false, 0 ] -[ "querylog_catalog", 2000, "-- create table views for convenience\ncreate view sys.querylog_catalog as select * from sys.querylog_catalog();", 1, true, 0, false, 0 ] -[ "querylog_calls", 2000, "create view sys.querylog_calls as select * from sys.querylog_calls();", 1, true, 0, false, 0 ] -[ "querylog_history", 2000, "create view sys.querylog_history as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0, false, 0 ] -[ "tracelog", 2000, "create view sys.tracelog as select * from sys.tracelog();", 1, true, 0, false, 0 ] -[ "sessions", 2000, "create view sys.sessions as select * from sys.sessions();", 1, true, 0, false, 0 ] -[ "optimizers", 2000, "create view sys.optimizers as select * from sys.optimizers();", 1, true, 0, false, 0 ] -[ "environment", 2000, "create view sys.environment as select * from sys.environment();", 1, true, 0, false, 0 ] -[ "queue", 2000, "create view sys.queue as select * from sys.queue();", 1, true, 0, false, 0 ] -[ "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] -[ "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] -[ "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] -[ "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(hashes) as hashes,\n\tsum(imprints) as imprints,\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 ] -[ "statistics", 2000, NULL, 0, true, 0, false, 0 ] -[ "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +#drop table tbls; # 10:59:54 > # 10:59:54 > "Done." _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
