Changeset: 94b992a46146 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94b992a46146
Modified Files:
clients/mapiclient/Tests/stethoscope--help.stable.err
monetdb5/mal/Tests/All
monetdb5/optimizer/Tests/All
sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.err
sql/test/BugTracker-2009/Tests/rollback_bug.stable.err
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
sql/test/BugTracker/Tests/broken_join.SF-1373391.stable.err
sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
Branch: int128
Log Message:
Merged with default branch.
diffs (281 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/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.err
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.err
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.err
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.err
@@ -21,10 +21,7 @@ QUERY = select case i
ERROR = !syntax error, unexpected FROM, expecting END in: "select case i
!when 0 then 'base table'
!when 1 then 'system table'
- !when 2 then 'view'
- !when 3 then 'session temporary table'
- !when 4 then 'temporary table'
- !from"
+ !when 2 then 'v"
# 23:52:38 >
# 23:52:38 > Done.
diff --git a/sql/test/BugTracker-2009/Tests/rollback_bug.stable.err
b/sql/test/BugTracker-2009/Tests/rollback_bug.stable.err
--- a/sql/test/BugTracker-2009/Tests/rollback_bug.stable.err
+++ b/sql/test/BugTracker-2009/Tests/rollback_bug.stable.err
@@ -89,12 +89,7 @@ QUERY = CREATE TABLE phpbb_attachments (
poster_id integer DEFAULT '0' NOT NULL ,
is_orphan LONG DEFAULT '1' NOT NULL ,
ERROR = !type (long) unknown in: "create table phpbb_attachments (
- ! attach_id integer default next value for
"sys"."phpbb_attachments_seq",
- ! post_msg_id integer default '0' not null ,
- ! topic_id integer default '0' not null ,
- ! in_message smallint default '0' not null ,
- ! poster_id integer default '0' not null ,
- ! is_orphan long default"
+ ! attach_id integer default next value for "sys""
MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
QUERY = CREATE TABLE phpbb_attachments (
attach_id integer DEFAULT next value for
"sys"."phpbb_attachments_seq",
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."
diff --git a/sql/test/BugTracker/Tests/broken_join.SF-1373391.stable.err
b/sql/test/BugTracker/Tests/broken_join.SF-1373391.stable.err
--- a/sql/test/BugTracker/Tests/broken_join.SF-1373391.stable.err
+++ b/sql/test/BugTracker/Tests/broken_join.SF-1373391.stable.err
@@ -28,42 +28,7 @@ QUERY = select urlid,clicktime from
urls.suburl6x0=clicks.suburl6x0 and
ERROR = !syntax error, unexpected ')', expecting SCOLON in: "select
urlid,clicktime from
!(clicks left outer join urls on
- !urls.suburl0x0=clicks.suburl0x0 and
- !urls.suburl0x1=clicks.suburl0x1 and
- !urls.suburl1x0=clicks.suburl1x0 and
- !urls.suburl1x1=clicks.suburl1x1 and
- !urls.suburl2x0=clicks.suburl2x0 and
- !urls.suburl2x1=clicks.suburl2x1 and
- !urls.suburl3x0=clicks.suburl3x0 and
- !urls.suburl3x1=clicks.suburl3x1 and
- !urls.suburl4x0=clicks.suburl4x0 and
- !urls.suburl4x1=clicks.suburl4x1 and
- !urls.suburl5x0=clicks.suburl5x0 and
- !urls.suburl5x1=clicks.suburl5x1 and
- !urls.suburl6x0=clicks.suburl6x0 and
- !urls.suburl6x1=clicks.suburl6x1 and
- !urls.suburl7x0=clicks.suburl7x0 and
- !urls.suburl7x1=clicks.suburl7x1 and
- !urls.suburl8x0=clicks.suburl8x0 and
- !urls.suburl8x1=clicks.suburl8x1 and
- !urls.suburl9x0=clicks.suburl9x0 and
- !urls.suburl9x1=clicks.suburl9x1 and
- !urls.suburl10x0=clicks.suburl10x0 and
- !urls.suburl10x1=clicks.suburl10x1 and
- !urls.suburl11x0=clicks.suburl11x0 and
- !urls.suburl11x1=clicks.suburl11x1 and
- !urls.suburl12x0=clicks.suburl12x0 and
- !urls.suburl12x1=clicks.suburl12x1 and
- !urls.suburl13x0=clicks.suburl13x0 and
- !urls.suburl13x1=clicks.suburl13x1 and
- !urls.suburl14x0=clicks.suburl14x0 and
- !urls.suburl14x1=clicks.suburl14x1 and
- !urls.suburl15x0=clicks.suburl15x0 and
- !urls.suburl15x1=clicks.suburl15x1 and
- !urls.suburl16x0=clicks.suburl16x0 and
- !urls.suburl16x1=clicks.suburl16x1) where
- !clicktime>'00:00:00' and clicktime<'23:59
- !:59')"
+ !urls.suburl0x0=click"
# 14:15:47 >
# 14:15:47 > Done.
diff --git
a/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
b/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
---
a/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
+++
b/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
@@ -22,8 +22,7 @@ ERROR = !syntax error, unexpected ORDER,
!from (
!select col2, count(*) as row_count
!from data_1to10
- !group by col2
- !order"
+ !group "
# 23:24:26 >
# 23:24:26 > Done.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
