Changeset: f053ff9ae91b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f053ff9ae91b
Modified Files:
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/scripts/15_querylog.sql
sql/scripts/25_debug.sql
sql/scripts/75_storagemodel.sql
sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
sql/test/BugTracker-2011/Tests/mclient-lsql-d.Bug-2861.stable.out
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
sql/test/Dependencies/Tests/dependency_loop.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/simple_view.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/mapi/Tests/php_monetdb.stable.out
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.err
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/Tests/insert_quser.stable.out
sql/test/ssqq/insert_query.sql
sql/test/ssqq/insert_queue.sql
sql/test/ssqq/insert_quser.sql
sql/test/ssqq/ssqq.sql
Branch: default
Log Message:
approved tests (and adapted some) after changes to the system
table (because of changes in the startup scripts)
diffs (truncated from 1398 to 300 lines):
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -87,10 +87,18 @@ mTests_sql_jdbc_tests tmp keys SYSTEM TA
mTests_sql_jdbc_tests tmp objects SYSTEM TABLE null null null
null rowid SYSTEM
mTests_sql_jdbc_tests tmp triggers SYSTEM TABLE null null
null null rowid SYSTEM
mTests_sql_jdbc_tests sys columns SYSTEM VIEW SELECT * FROM (SELECT
p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t)
AS columns; null null null rowid SYSTEM
+mTests_sql_jdbc_tests sys environment SYSTEM VIEW create view
sys.environment as select * from sys.environment(); null null null
rowid SYSTEM
+mTests_sql_jdbc_tests sys optimizers SYSTEM VIEW create view
sys.optimizers as select * from sys.optimizers(); null null null
rowid SYSTEM
+mTests_sql_jdbc_tests sys querylog_calls SYSTEM VIEW create view
sys.querylog_calls as select * from sys.querylog_calls(); null null
null rowid SYSTEM
+mTests_sql_jdbc_tests sys querylog_catalog SYSTEM VIEW --
create table views for convenience
+create view sys.querylog_catalog as select * from sys.querylog_catalog();
null null null rowid SYSTEM
mTests_sql_jdbc_tests sys querylog_history SYSTEM VIEW create
view sys.querylog_history as
select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
from sys.querylog_catalog() qd, sys.querylog_calls() ql
where qd.id = ql.id and qd.owner = user; null null null rowid
SYSTEM
+mTests_sql_jdbc_tests sys queue SYSTEM VIEW create view sys.queue
as select * from sys.queue(); null null null rowid SYSTEM
+mTests_sql_jdbc_tests sys storage SYSTEM VIEW create view sys.storage
as select * from sys.storage(); null null null rowid SYSTEM
+mTests_sql_jdbc_tests sys storagemodel SYSTEM VIEW create view
sys.storagemodel as select * from sys.storagemodel(); null null
null rowid SYSTEM
mTests_sql_jdbc_tests sys tables SYSTEM VIEW 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;
null null null rowid SYSTEM
mTests_sql_jdbc_tests sys tablestoragemodel SYSTEM VIEW -- A
summary of the table storage requirement is is available as a table view.
-- The auxillary column denotes the maximum space if all non-sorted columns
@@ -102,6 +110,7 @@ as select "schema","table",max(count) as
sum(indices) as indices,
sum(case when sorted = false then 8 * count else 0 end) as auxillary
from sys.storagemodel() group by "schema","table"; null null null
rowid SYSTEM
+mTests_sql_jdbc_tests sys tracelog SYSTEM VIEW create view
sys.tracelog as select * from sys.tracelog(); null null null
rowid SYSTEM
mTests_sql_jdbc_tests sys users SYSTEM VIEW 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" ; null null null
rowid SYSTEM
# 09:57:01 >
diff --git a/sql/scripts/15_querylog.sql b/sql/scripts/15_querylog.sql
--- a/sql/scripts/15_querylog.sql
+++ b/sql/scripts/15_querylog.sql
@@ -62,31 +62,15 @@ external name sql.querylog_calls;
-- create table views for convenience
create view sys.querylog_catalog as select * from sys.querylog_catalog();
-
-update sys._tables
- set system = true
- where name = 'querylog_catalog'
- and schema_id = (select id from sys.schemas where name = 'sys');
-
create view sys.querylog_calls as select * from sys.querylog_calls();
-
-update sys._tables
- set system = true
- where name = 'querylog_calls'
- and schema_id = (select id from sys.schemas where name = 'sys');
-
create view sys.querylog_history as
select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
from sys.querylog_catalog() qd, sys.querylog_calls() ql
where qd.id = ql.id and qd.owner = user;
-update sys._tables
- set system = true
- where name = 'querylog_history'
- and schema_id = (select id from sys.schemas where name = 'sys');
update sys._tables
set system = true
- where name = 'querylog_history'
+ where name in ('querylog_history', 'querylog_calls', 'querylog_catalog')
and schema_id = (select id from sys.schemas where name = 'sys');
-- reset history for a particular user
diff --git a/sql/scripts/25_debug.sql b/sql/scripts/25_debug.sql
--- a/sql/scripts/25_debug.sql
+++ b/sql/scripts/25_debug.sql
@@ -38,11 +38,6 @@ create function sys.optimizers ()
external name sql.optimizers;
create view sys.optimizers as select * from sys.optimizers();
-update sys._tables
- set system = true
- where name = 'optimizers'
- and schema_id = (select id from sys.schemas where name = 'sys');
-
-- The environment table
create function sys.environment()
returns table ("name" string, value string)
@@ -51,7 +46,7 @@ create view sys.environment as select *
update sys._tables
set system = true
- where name = 'environment'
+ where name in ( 'environment', 'optimizers')
and schema_id = (select id from sys.schemas where name = 'sys');
-- The BAT buffer pool overview
diff --git a/sql/scripts/75_storagemodel.sql b/sql/scripts/75_storagemodel.sql
--- a/sql/scripts/75_storagemodel.sql
+++ b/sql/scripts/75_storagemodel.sql
@@ -158,7 +158,8 @@ as select "schema","table",max(count) as
sum(indices) as indices,
sum(case when sorted = false then 8 * count else 0 end) as auxillary
from sys.storagemodel() group by "schema","table";
+
update sys._tables
set system = true
- where name = 'tablestoragemodel'
+ where name in ('tablestoragemodel', 'storagemodel', 'storage')
and schema_id = (select id from sys.schemas where name = 'sys');
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
@@ -114,8 +114,6 @@ Ready.
START TRANSACTION;
SET SCHEMA "sys";
-create view sys.storage as select * from sys.storage();
-create view sys.storagemodel as select * from sys.storagemodel();
CREATE TABLE "sys"."allnewtriples" (
"id" INTEGER NOT NULL,
"subject" INTEGER NOT NULL,
diff --git
a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
--- a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
+++ b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
@@ -82,9 +82,9 @@ stderr of test 'sql_command_kills_db.SF-
# 16:15:09 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=39774 -G
# 16:15:09 >
-MAPI = (monetdb) /var/tmp/mtest-12327/.s.monetdb.30662
+MAPI = (monetdb) /var/tmp/mtest-2016/.s.monetdb.32311
QUERY = insert into t1 values ((select id from tables));
-ERROR = !cardinality violation (31>1)
+ERROR = !cardinality violation (39>1)
# 16:15:09 >
# 16:15:09 > Done.
diff --git
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
---
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
+++
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
@@ -24,8 +24,6 @@ Ready.
# 12:59:51 > mclient -lsql -umonetdb -Pmonetdb --host=rig --port=33577
# 12:59:51 >
-VIEW sys.storage
-VIEW sys.storagemodel
CREATE TABLE "sys"."triggers" (
"id" INTEGER,
"name" VARCHAR(1024),
diff --git
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
---
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
+++
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
@@ -24,8 +24,6 @@ Ready.
# 20:57:34 > mclient -lsql -ftest -i -e --host=alf --port=32448
# 20:57:34 >
-VIEW sys.storage
-VIEW sys.storagemodel
CREATE TABLE "sys"."triggers" (
"id" INTEGER,
"name" VARCHAR(1024),
diff --git
a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
--- a/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
+++ b/sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
@@ -29,8 +29,6 @@ Ready.
# 20:57:34 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=alf
--port=32448 -i <
/net/alf.ins.cwi.nl/export/scratch1/niels/rc/MonetDB/sql/src/test/BugTracker-2009/Tests/../dumping_tables.SF-2776908.sql
# 20:57:34 >
-VIEW sys.storage
-VIEW sys.storagemodel
CREATE TABLE "sys"."triggers" (
"id" INTEGER,
"name" VARCHAR(1024),
diff --git a/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
b/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
--- a/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
+++ b/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
@@ -31,8 +31,6 @@ Ready.
START TRANSACTION;
SET SCHEMA "sys";
-create view sys.storage as select * from sys.storage();
-create view sys.storagemodel as select * from sys.storagemodel();
CREATE TABLE "sys"."table_a" (
"table_a_id" INTEGER NOT NULL,
"value_a" INTEGER NOT NULL,
diff --git
a/sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
b/sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
--- a/sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
+++ b/sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
@@ -26,8 +26,6 @@ Ready.
START TRANSACTION;
SET SCHEMA "sys";
-create view sys.storage as select * from sys.storage();
-create view sys.storagemodel as select * from sys.storagemodel();
CREATE TABLE "sys"."tf" (
"a" INTEGER
);
diff --git
a/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
b/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
--- a/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
+++ b/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
@@ -29,19 +29,19 @@ Ready.
% L1 # name
% wrd # type
% 2 # length
-[ 30 ]
+[ 38 ]
#select count(distinct name) from tables;
% .tables # table_name
% L1 # name
% wrd # type
% 2 # length
-[ 24 ]
+[ 32 ]
#select count(name) , count(distinct name) from tables;
% .tables, .tables # table_name
% L1, L2 # name
% wrd, wrd # type
% 2, 2 # length
-[ 30, 24 ]
+[ 38, 32 ]
# 10:05:42 >
# 10:05:42 > Done.
diff --git a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
--- a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
+++ b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
@@ -123,6 +123,14 @@ Ready.
[ 123 ]
[ 123 ]
[ 123 ]
+[ 123 ]
+[ 123 ]
+[ 123 ]
+[ 123 ]
+[ 123 ]
+[ 123 ]
+[ 123 ]
+[ 123 ]
# 17:14:07 >
# 17:14:07 > "Done."
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,9 +17,6 @@ stdout of test 'interrupted-initializati
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
START TRANSACTION;
-SET SCHEMA "sys";
-create view sys.storage as select * from sys.storage();
-create view sys.storagemodel as select * from sys.storagemodel();
COMMIT;
# MonetDB 5 server v11.5.8
# This is an unreleased version
diff --git a/sql/test/BugTracker-2011/Tests/mclient-lsql-d.Bug-2861.stable.out
b/sql/test/BugTracker-2011/Tests/mclient-lsql-d.Bug-2861.stable.out
--- a/sql/test/BugTracker-2011/Tests/mclient-lsql-d.Bug-2861.stable.out
+++ b/sql/test/BugTracker-2011/Tests/mclient-lsql-d.Bug-2861.stable.out
@@ -27,15 +27,9 @@ Ready.
# 10:06:13 >
-VIEW sys.storage
-VIEW sys.storagemodel
#create table bug2861 (id int);
TABLE sys.bug2861
-VIEW sys.storage
-VIEW sys.storagemodel
#drop table bug2861;
-VIEW sys.storage
-VIEW sys.storagemodel
# 10:06:13 >
# 10:06:13 > Done.
diff --git
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
---
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
+++
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
@@ -28,13 +28,13 @@ Ready.
% L2, L1 # name
% tinyint, wrd # type
% 1, 2 # length
-[ 1, 31 ]
+[ 1, 39 ]
#SELECT (SELECT count(*) FROM tables), 1;
% .tables, . # table_name
% L1, single_value # name
% wrd, tinyint # type
% 2, 1 # length
-[ 31, 1 ]
+[ 39, 1 ]
# 21:48:51 >
# 21:48:51 > "Done."
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
@@ -61,9 +61,9 @@ Ready.
[ 5595, "optimizers", 2000, "create view sys.optimizers as select *
from sys.optimizers();", 1, true, 0, false, 0 ]
[ 5605, "environment", 2000, "create view sys.environment as select
* from sys.environment();", 1, true, 0, false, 0 ]
[ 5647, "queue", 2000, "create view sys.queue as select * from
sys.queue();", 1, true, 0, false, 0 ]
-[ 6103, "storage", 2000, "create view sys.storage as select *
from sys.storage();", 1, false, 0, false, 0 ]
+[ 6103, "storage", 2000, "create view sys.storage as select *
from sys.storage();", 1, true, 0, false, 0 ]
[ 6115, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6158, "storagemodel", 2000, "create view sys.storagemodel as select
* from sys.storagemodel();", 1, false, 0, false, 0 ]
+[ 6158, "storagemodel", 2000, "create view sys.storagemodel as select
* from sys.storagemodel();", 1, true, 0, false, 0 ]
[ 6167, "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 ]
[ 6189, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
[ 6298, "r", 2000, NULL, 0, false, 0, false, 0
]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
