Changeset: 8dff6b1869bf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8dff6b1869bf
Modified Files:
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dump/Tests/dump-empty.stable.out
sql/test/Dump/Tests/dump.stable.out
sql/test/UserDump/Tests/create.stable.out
sql/test/bugs/Tests/crash_order_by.stable.out
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/bugs/Tests/simple_view.stable.out
sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/testdb/Tests/testdb-dump.stable.out
Branch: default
Log Message:
approve more tests because of querylog schema changes
diffs (truncated from 1371 to 300 lines):
diff --git
a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
---
a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
+++
b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
@@ -17,13 +17,6 @@ stdout of test 'interrupted-initializati
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
START TRANSACTION;
-CREATE SCHEMA "querylog" AUTHORIZATION "monetdb";
-SET SCHEMA "querylog";
-create view querylog.history as
-select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
-from querylog.catalog() qd, querylog.calls() ql
-where qd.id = ql.id and qd.owner = user;
-SET SCHEMA "sys";
COMMIT;
# MonetDB 5 server v11.5.8
# This is an unreleased version
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
@@ -54,11 +54,11 @@ Ready.
[ 5104, "user_role", 2000, NULL, 0, true, 0, false,
0 ]
[ 5107, "auths", 2000, NULL, 0, true, 0, false,
0 ]
[ 5111, "privileges", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5298, "history", 5255, "create view querylog.history
as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run,
ql.ship, ql.cpu, ql.space, ql.io \nfrom querylog.catalog() qd, querylog.calls()
ql\nwhere qd.id = ql.id and qd.owner = user;", 1, false, 0,
false, 0 ]
-[ 6049, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6090, "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 ]
-[ 6112, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6221, "r", 2000, NULL, 0, false, 0, false, 0
]
+[ 5297, "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 ]
+[ 6057, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
+[ 6098, "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 ]
+[ 6120, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
+[ 6229, "r", 2000, NULL, 0, false, 0, false, 0
]
# 18:53:13 >
# 18:53:13 > "Done."
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -29,7 +29,7 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 123 # length
+% 122 # length
function user.s0_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -55,7 +55,7 @@ end s0_1;
% .explain # table_name
% mal # name
% clob # type
-% 127 # length
+% 126 # length
function user.s1_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -81,7 +81,7 @@ end s1_1;
% .explain # table_name
% mal # name
% clob # type
-% 124 # length
+% 123 # length
function user.s2_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -107,7 +107,7 @@ end s2_1;
% .explain # table_name
% mal # name
% clob # type
-% 128 # length
+% 127 # length
function user.s3_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -153,7 +153,7 @@ end s3_1;
% .explain # table_name
% mal # name
% clob # type
-% 127 # length
+% 126 # length
function user.s4_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -181,7 +181,7 @@ end s4_1;
% .explain # table_name
% mal # name
% clob # type
-% 131 # length
+% 130 # length
function user.s5_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -209,7 +209,7 @@ end s5_1;
% .explain # table_name
% mal # name
% clob # type
-% 128 # length
+% 127 # length
function user.s6_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
@@ -237,7 +237,7 @@ end s6_1;
% .explain # table_name
% mal # name
% clob # type
-% 132 # length
+% 131 # length
function user.s7_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
diff --git
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
---
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
+++
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
@@ -31,10 +31,9 @@ Ready.
% .ftf # table_name
% sch # name
% varchar # type
-% 8 # length
+% 3 # length
[ "sys" ]
[ "tmp" ]
-[ "querylog" ]
[ "ft" ]
# 15:58:57 >
diff --git
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
---
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
+++
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
@@ -27,10 +27,9 @@ Ready.
% .ftf # table_name
% sch # name
% varchar # type
-% 8 # length
+% 3 # length
[ "sys" ]
[ "tmp" ]
-[ "querylog" ]
[ "ft" ]
#drop function ft.func;
#drop schema ft;
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out
b/sql/test/Dependencies/Tests/Dependencies.stable.out
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out
@@ -91,10 +91,9 @@ Dependencies between database objects
% sys.a, sys.s, . # table_name
% name, name, single_value # name
% varchar, varchar, char # type
-% 7, 8, 10 # length
+% 7, 4, 10 # length
[ "monetdb", "sys", "DEP_SCHEMA" ]
[ "monetdb", "tmp", "DEP_SCHEMA" ]
-[ "monetdb", "querylog", "DEP_SCHEMA" ]
[ "monetdb", "test", "DEP_SCHEMA" ]
% .t, .v, . # table_name
% name, name, single_value # name
@@ -584,10 +583,9 @@ Cleanup
% sys.a, sys.s, . # table_name
% name, name, single_value # name
% varchar, varchar, char # type
-% 7, 8, 10 # length
+% 7, 3, 10 # length
[ "monetdb", "sys", "DEP_SCHEMA" ]
[ "monetdb", "tmp", "DEP_SCHEMA" ]
-[ "monetdb", "querylog", "DEP_SCHEMA" ]
#SELECT t.name, v.name, 'DEP_VIEW' from tables as t, tables as v, dependencies
as dep where t.id = dep.id AND v.id = dep.depend_id AND dep.depend_type = 5 AND
v.type = 1;
% .t, .v, . # table_name
% name, name, single_value # name
diff --git a/sql/test/Dump/Tests/dump-empty.stable.out
b/sql/test/Dump/Tests/dump-empty.stable.out
--- a/sql/test/Dump/Tests/dump-empty.stable.out
+++ b/sql/test/Dump/Tests/dump-empty.stable.out
@@ -28,13 +28,6 @@ Ready.
#msqldump tables Wed Sep 8 10:50:27 2010
START TRANSACTION;
-CREATE SCHEMA "querylog" AUTHORIZATION "monetdb";
-SET SCHEMA "querylog";
-create view querylog.history as
-select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
-from querylog.catalog() qd, querylog.calls() ql
-where qd.id = ql.id and qd.owner = user;
-SET SCHEMA "sys";
COMMIT;
# 10:50:28 >
diff --git a/sql/test/Dump/Tests/dump.stable.out
b/sql/test/Dump/Tests/dump.stable.out
--- a/sql/test/Dump/Tests/dump.stable.out
+++ b/sql/test/Dump/Tests/dump.stable.out
@@ -25,13 +25,7 @@ Ready.
# 17:06:37 >
START TRANSACTION;
-CREATE SCHEMA "querylog" AUTHORIZATION "monetdb";
CREATE SEQUENCE "sys"."test_seq" AS INTEGER;
-SET SCHEMA "querylog";
-create view querylog.history as
-select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
-from querylog.catalog() qd, querylog.calls() ql
-where qd.id = ql.id and qd.owner = user;
SET SCHEMA "sys";
CREATE TABLE "sys"."test" (
"id" INTEGER,
diff --git a/sql/test/UserDump/Tests/create.stable.out
b/sql/test/UserDump/Tests/create.stable.out
--- a/sql/test/UserDump/Tests/create.stable.out
+++ b/sql/test/UserDump/Tests/create.stable.out
@@ -27,16 +27,10 @@ Ready.
START TRANSACTION;
CREATE USER "test" WITH ENCRYPTED PASSWORD
'ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff'
NAME 'Test User' SCHEMA "sys";
CREATE USER "voc" WITH ENCRYPTED PASSWORD
'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e'
NAME 'VOC Explorer' SCHEMA "sys";
-CREATE SCHEMA "querylog" AUTHORIZATION "monetdb";
CREATE SCHEMA "test" AUTHORIZATION "test";
CREATE SCHEMA "voc" AUTHORIZATION "voc";
ALTER USER "test" SET SCHEMA "test";
ALTER USER "voc" SET SCHEMA "voc";
-SET SCHEMA "querylog";
-create view querylog.history as
-select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
-from querylog.catalog() qd, querylog.calls() ql
-where qd.id = ql.id and qd.owner = user;
SET SCHEMA "voc";
CREATE TABLE "voc"."foo" (
"id" INTEGER NOT NULL,
diff --git a/sql/test/bugs/Tests/crash_order_by.stable.out
b/sql/test/bugs/Tests/crash_order_by.stable.out
--- a/sql/test/bugs/Tests/crash_order_by.stable.out
+++ b/sql/test/bugs/Tests/crash_order_by.stable.out
@@ -37,8 +37,8 @@ Ready.
[ 12, "1" ]
[ 9, "1" ]
[ 5, "1" ]
-[ 2, "1" ]
-[ 19, "1" ]
+[ 3, "1" ]
+[ 18, "1" ]
# 23:16:56 >
# 23:16:56 > Done.
diff --git
a/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
b/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
--- a/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
+++ b/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
@@ -26,11 +26,9 @@ Ready.
% sys.s, sys., sys.s # table_name
% name, char_length_name, L1 # name
% varchar, int, wrd # type
-% 8, 1, 2 # length
+% 3, 1, 2 # length
[ "sys", 3, 10 ]
[ "tmp", 3, 10 ]
-[ "querylog", 8, 10 ]
-[ "sysmon", 6, 10 ]
# 12:48:35 >
# 12:48:35 > Done.
diff --git a/sql/test/bugs/Tests/simple_view.stable.out
b/sql/test/bugs/Tests/simple_view.stable.out
--- a/sql/test/bugs/Tests/simple_view.stable.out
+++ b/sql/test/bugs/Tests/simple_view.stable.out
@@ -54,7 +54,7 @@ Ready.
[ "user_role", "str", 1 ]
[ "auths", "str", 1 ]
[ "privileges", "str", 1 ]
-[ "history", "str", 1 ]
+[ "querylog_history", "str", 1 ]
[ "storagemodelinput", "str", 1 ]
[ "tablestoragemodel", "str", 1 ]
[ "systemfunctions", "str", 1 ]
diff --git
a/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
b/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
---
a/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
+++
b/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
@@ -60,8 +60,7 @@ Ready.
% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables #
table_name
% TABLE_CAT, TABLE_SCHEM, TABLE_NAME, TABLE_TYPE, REMARKS,
TYPE_CAT, TYPE_SCHEM, TYPE_NAME, SELF_REFERENCING_COL_NAME,
REF_GENERATION # name
% char, varchar, varchar, char, char, char, char,
char, char, char # type
-% 4, 8, 7, 20, 0, 0, 0, 0, 5, 6 #
length
-[ "demo", "querylog", "history", "VIEW", "", NULL, NULL,
NULL, "rowid", "SYSTEM" ]
+% 4, 0, 0, 20, 0, 0, 0, 0, 5, 6 #
length
#SELECT 3 AS number;
% . # table_name
% number # name
@@ -71,10 +70,9 @@ Ready.
% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables #
table_name
% TABLE_CAT, TABLE_SCHEM, TABLE_NAME, TABLE_TYPE, REMARKS,
TYPE_CAT, TYPE_SCHEM, TYPE_NAME, SELF_REFERENCING_COL_NAME,
REF_GENERATION # name
% char, varchar, varchar, char, char, char, char,
char, char, char # type
-% 4, 8, 11, 20, 0, 0, 0, 0, 5, 6 #
length
+% 4, 3, 11, 20, 0, 0, 0, 0, 5, 6 #
length
[ "demo", "sys", " ", "TABLE", "", NULL, NULL, NULL,
"rowid", "SYSTEM" ]
[ "demo", "sys", "test_update", "TABLE", "", NULL, NULL,
NULL, "rowid", "SYSTEM" ]
-[ "demo", "querylog", "history", "VIEW", "", NULL, NULL,
NULL, "rowid", "SYSTEM" ]
# 12:52:40 >
# 12:52:40 > Done.
diff --git a/sql/test/leaks/Tests/check0.stable.out
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -53,27 +53,27 @@ Ready.
[ "oid", "int", 2 ]
[ "oid", "int", 8 ]
[ "oid", "int", 8 ]
-[ "oid", "int", 155 ]
-[ "oid", "int", 1207 ]
-[ "oid", "int", 3316 ]
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
