Changeset: 0e2fe5e4c948 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e2fe5e4c948
Modified Files:
Branch:
Log Message:
many output approvals
diffs (truncated from 746 to 300 lines):
diff -r af01cbeb8cae -r 0e2fe5e4c948
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
Tue May 18 14:06:21 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
Tue May 18 14:09:08 2010 +0200
@@ -25,6 +25,7 @@
# 11:17:13 > mclient -lsql -ftest -i -e --host=alf --port=39432
# 11:17:13 >
+TABLE sys.queryhistory
TABLE sys.url_test
CREATE TABLE "sys"."triggers" (
"id" int,
diff -r af01cbeb8cae -r 0e2fe5e4c948
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
Tue May 18 14:06:21 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
Tue May 18 14:09:08 2010 +0200
@@ -30,6 +30,7 @@
# 11:17:12 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=alf
--port=39432 -i <
/net/alf.ins.cwi.nl/export/scratch1/niels/MonetDB/sql/src/test/BugTracker-2009/Tests/../dumping_tables.SF-2776908.sql
# 11:17:12 >
+TABLE sys.queryhistory
TABLE sys.url_test
CREATE TABLE "sys"."triggers" (
"id" int,
diff -r af01cbeb8cae -r 0e2fe5e4c948
sql/src/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out Tue May
18 14:06:21 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out Tue May
18 14:09:08 2010 +0200
@@ -55,8 +55,8 @@
"id" bigint,
"ctime" TIMESTAMP,
"arguments" CHARACTER LARGE OBJECT,
- "xtime" bigint,
- "rtime" bigint,
+ "execute" bigint,
+ "result" bigint,
"foot" bigint,
"memory" bigint,
"tuples" bigint,
@@ -64,7 +64,7 @@
"oublock" bigint
);
create view querylog as
-select qd.*, ql.ctime, ql.arguments, ql.xtime, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql
+select qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory,
ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql
where qd.id = ql.id;
-- the signature is used in the kernel, don't change it
create procedure keepquery(
@@ -94,6 +94,11 @@
values( id, ctime, arguments, xtime, rtime,
foot, memory, tuples, inblock, oublock );
end;
+create procedure resethistory()
+begin
+ delete from callhistory;
+ delete from queryhistory;
+end;
-- The contents of this file are subject to the MonetDB Public License
-- Version 1.1 (the "License"); you may not use this file except in
-- compliance with the License. You may obtain a copy of the License at
diff -r af01cbeb8cae -r 0e2fe5e4c948
sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
Tue May 18 14:06:21 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
Tue May 18 14:09:08 2010 +0200
@@ -37,6 +37,24 @@
"theurl" url,
"name" CHARACTER LARGE OBJECT
);
+CREATE TABLE "sys"."queryhistory" (
+ "id" bigint NOT NULL,
+ "defined" TIMESTAMP,
+ "name" CHARACTER LARGE OBJECT,
+ "query" CHARACTER LARGE OBJECT,
+ "parse" bigint,
+ "optimize" bigint,
+ CONSTRAINT "queryhistory_id_pkey" PRIMARY KEY ("id")
+);
+COPY 3 RECORDS INTO "sys"."queryhistory" FROM stdin USING DELIMITERS
'\t','\n','"';
+1026870 2010-05-18 11:49:13.000000 "monetdb" "select id from
tables where id > 0;" 4553 1677
+1027100 2010-05-18 11:49:13.000000 "monetdb" "create table
t1 (id int);" 116 332
+1027156 2010-05-18 11:49:13.000000 "monetdb" "drop table
t1;" 70 285
+create procedure resethistory()
+begin
+ delete from callhistory;
+ delete from queryhistory;
+end;
-- The contents of this file are subject to the MonetDB Public License
-- Version 1.1 (the "License"); you may not use this file except in
-- compliance with the License. You may obtain a copy of the License at
diff -r af01cbeb8cae -r 0e2fe5e4c948
sql/src/test/BugTracker-2009/drop_history.sql
--- a/sql/src/test/BugTracker-2009/drop_history.sql Tue May 18 14:06:21
2010 +0200
+++ b/sql/src/test/BugTracker-2009/drop_history.sql Tue May 18 14:09:08
2010 +0200
@@ -1,5 +1,6 @@
drop procedure keepCall;
drop procedure keepQuery;
+drop procedure resetHistory;
drop view queryLog;
drop table callHistory;
drop table queryHistory;
diff -r af01cbeb8cae -r 0e2fe5e4c948
sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
Tue May 18 14:06:21 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
Tue May 18 14:09:08 2010 +0200
@@ -80,12 +80,13 @@
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = mone...@alf:32764
+MAPI = mone...@alf:34051
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
ERROR = !SQLException:zero_or_one:cardinality violation (50>1)
-MAPI = mone...@alf:32764
+MAPI = mone...@alf:34051
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
-ERROR = !SQLException:zero_or_one:cardinality violation (287>1)
+ERROR = !SQLException:zero_or_one:cardinality violation (288>1)
+
# 21:00:43 >
# 21:00:43 > Done.
diff -r af01cbeb8cae -r 0e2fe5e4c948
sql/src/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
---
a/sql/src/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
Tue May 18 14:06:21 2010 +0200
+++
b/sql/src/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
Tue May 18 14:09:08 2010 +0200
@@ -51,8 +51,8 @@
"id" bigint,
"ctime" TIMESTAMP,
"arguments" CHARACTER LARGE OBJECT,
- "xtime" bigint,
- "rtime" bigint,
+ "execute" bigint,
+ "result" bigint,
"foot" bigint,
"memory" bigint,
"tuples" bigint,
@@ -60,7 +60,7 @@
"oublock" bigint
);
create view querylog as
-select qd.*, ql.ctime, ql.arguments, ql.xtime, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql
+select qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory,
ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql
where qd.id = ql.id;
-- the signature is used in the kernel, don't change it
create procedure keepquery(
@@ -90,6 +90,11 @@
values( id, ctime, arguments, xtime, rtime,
foot, memory, tuples, inblock, oublock );
end;
+create procedure resethistory()
+begin
+ delete from callhistory;
+ delete from queryhistory;
+end;
-- The contents of this file are subject to the MonetDB Public License
-- Version 1.1 (the "License"); you may not use this file except in
-- compliance with the License. You may obtain a copy of the License at
diff -r af01cbeb8cae -r 0e2fe5e4c948
sql/src/test/Dependencies/Tests/Dependencies.stable.out
--- a/sql/src/test/Dependencies/Tests/Dependencies.stable.out Tue May 18
14:06:21 2010 +0200
+++ b/sql/src/test/Dependencies/Tests/Dependencies.stable.out Tue May 18
14:09:08 2010 +0200
@@ -164,15 +164,16 @@
% varchar, varchar, char # type
% 9, 8, 8 # length
[ "id", "querylog", "DEP_VIEW" ]
-[ "id", "querylog", "DEP_VIEW" ]
[ "defined", "querylog", "DEP_VIEW" ]
[ "name", "querylog", "DEP_VIEW" ]
[ "query", "querylog", "DEP_VIEW" ]
[ "parse", "querylog", "DEP_VIEW" ]
[ "optimize", "querylog", "DEP_VIEW" ]
+[ "id", "querylog", "DEP_VIEW" ]
[ "ctime", "querylog", "DEP_VIEW" ]
[ "arguments", "querylog", "DEP_VIEW" ]
-[ "xtime", "querylog", "DEP_VIEW" ]
+[ "execute", "querylog", "DEP_VIEW" ]
+[ "result", "querylog", "DEP_VIEW" ]
[ "foot", "querylog", "DEP_VIEW" ]
[ "memory", "querylog", "DEP_VIEW" ]
[ "tuples", "querylog", "DEP_VIEW" ]
@@ -483,7 +484,8 @@
[ "optimize", "querylog", "DEP_VIEW" ]
[ "ctime", "querylog", "DEP_VIEW" ]
[ "arguments", "querylog", "DEP_VIEW" ]
-[ "xtime", "querylog", "DEP_VIEW" ]
+[ "execute", "querylog", "DEP_VIEW" ]
+[ "result", "querylog", "DEP_VIEW" ]
[ "foot", "querylog", "DEP_VIEW" ]
[ "memory", "querylog", "DEP_VIEW" ]
[ "tuples", "querylog", "DEP_VIEW" ]
diff -r af01cbeb8cae -r 0e2fe5e4c948
sql/src/test/Dependencies/Tests/dependency_loop.stable.out
--- a/sql/src/test/Dependencies/Tests/dependency_loop.stable.out Tue May
18 14:06:21 2010 +0200
+++ b/sql/src/test/Dependencies/Tests/dependency_loop.stable.out Tue May
18 14:09:08 2010 +0200
@@ -28,7 +28,7 @@
% L1 # name
% wrd # type
% 2 # length
-[ 89 ]
+[ 90 ]
# 10:37:19 >
# 10:37:19 > Done.
diff -r af01cbeb8cae -r 0e2fe5e4c948 sql/src/test/Dump/Tests/dump.stable.out
--- a/sql/src/test/Dump/Tests/dump.stable.out Tue May 18 14:06:21 2010 +0200
+++ b/sql/src/test/Dump/Tests/dump.stable.out Tue May 18 14:09:08 2010 +0200
@@ -51,8 +51,8 @@
"id" bigint,
"ctime" TIMESTAMP,
"arguments" CHARACTER LARGE OBJECT,
- "xtime" bigint,
- "rtime" bigint,
+ "execute" bigint,
+ "result" bigint,
"foot" bigint,
"memory" bigint,
"tuples" bigint,
@@ -60,7 +60,7 @@
"oublock" bigint
);
create view querylog as
-select qd.*, ql.ctime, ql.arguments, ql.xtime, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql
+select qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory,
ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql
where qd.id = ql.id;
-- the signature is used in the kernel, don't change it
create procedure keepquery(
@@ -90,6 +90,11 @@
values( id, ctime, arguments, xtime, rtime,
foot, memory, tuples, inblock, oublock );
end;
+create procedure resethistory()
+begin
+ delete from callhistory;
+ delete from queryhistory;
+end;
-- The contents of this file are subject to the MonetDB Public License
-- Version 1.1 (the "License"); you may not use this file except in
-- compliance with the License. You may obtain a copy of the License at
diff -r af01cbeb8cae -r 0e2fe5e4c948 sql/src/test/leaks/Tests/check0.stable.out
--- a/sql/src/test/leaks/Tests/check0.stable.out Tue May 18 14:06:21
2010 +0200
+++ b/sql/src/test/leaks/Tests/check0.stable.out Tue May 18 14:09:08
2010 +0200
@@ -32,13 +32,13 @@
[ "int", "int", 15 ]
[ "int", "lng", 2 ]
[ "int", "str", 144 ]
-[ "oid", "bit", 1104 ]
-[ "oid", "bit", 1104 ]
-[ "oid", "bit", 1104 ]
+[ "oid", "bit", 1105 ]
+[ "oid", "bit", 1105 ]
+[ "oid", "bit", 1105 ]
[ "oid", "int", 18 ]
[ "oid", "int", 18 ]
-[ "oid", "int", 1104 ]
-[ "oid", "int", 1104 ]
+[ "oid", "int", 1105 ]
+[ "oid", "int", 1105 ]
[ "oid", "int", 3044 ]
[ "oid", "int", 3044 ]
[ "oid", "int", 3044 ]
@@ -49,9 +49,9 @@
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
[ "oid", "str", 18 ]
-[ "oid", "str", 1104 ]
-[ "oid", "str", 1104 ]
-[ "oid", "str", 1104 ]
+[ "oid", "str", 1105 ]
+[ "oid", "str", 1105 ]
+[ "oid", "str", 1105 ]
[ "oid", "str", 3044 ]
[ "oid", "str", 3044 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
@@ -59,7 +59,7 @@
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 497 ]
+[ "transient", 494 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r af01cbeb8cae -r 0e2fe5e4c948 sql/src/test/leaks/Tests/check1.stable.out
--- a/sql/src/test/leaks/Tests/check1.stable.out Tue May 18 14:06:21
2010 +0200
+++ b/sql/src/test/leaks/Tests/check1.stable.out Tue May 18 14:09:08
2010 +0200
@@ -35,10 +35,10 @@
[ "oid", "bit", 0 ]
[ "oid", "bit", 56 ]
[ "oid", "bit", 56 ]
-[ "oid", "bit", 287 ]
-[ "oid", "bit", 1104 ]
-[ "oid", "bit", 1104 ]
-[ "oid", "bit", 1104 ]
+[ "oid", "bit", 288 ]
+[ "oid", "bit", 1105 ]
+[ "oid", "bit", 1105 ]
+[ "oid", "bit", 1105 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -79,16 +79,16 @@
[ "oid", "int", 29 ]
[ "oid", "int", 56 ]
[ "oid", "int", 56 ]
-[ "oid", "int", 184 ]
-[ "oid", "int", 184 ]
-[ "oid", "int", 287 ]
-[ "oid", "int", 287 ]
-[ "oid", "int", 287 ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
