Changeset: 2b81085169d7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2b81085169d7
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/bugs/Tests/crash_order_by.stable.out
Branch: default
Log Message:
some more output approval after changeset 7fc299e39776
diffs (150 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,8 +55,8 @@ Ready.
% . # table_name
% def # name
% clob # type
-% 447 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();"
]
+% 448 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.garbageCollector();"
]
#explain copy into ttt from '/:\tmp/xyz';
% .explain # table_name
% mal # name
@@ -85,8 +85,8 @@ end s2_1;
% . # table_name
% def # name
% clob # type
-% 470 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 471 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/:\tmp/xyz';
% .explain # table_name
% mal # name
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
@@ -54,6 +54,7 @@ TABLE_TYPE
mTests_sql_jdbc_tests
Resultset with 3 columns
TABLE_SCHEM TABLE_CATALOG TABLE_CAT
+querylog mTests_sql_jdbc_tests mTests_sql_jdbc_tests
sys mTests_sql_jdbc_tests mTests_sql_jdbc_tests
tmp mTests_sql_jdbc_tests mTests_sql_jdbc_tests
Resultset with 3 columns
@@ -65,7 +66,6 @@ mTests_sql_jdbc_tests sys _columns SYSTE
mTests_sql_jdbc_tests sys _tables SYSTEM TABLE null null null
null rowid SYSTEM
mTests_sql_jdbc_tests sys args SYSTEM TABLE null null null
null rowid SYSTEM
mTests_sql_jdbc_tests sys auths SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys callhistory SYSTEM TABLE null null
null null rowid SYSTEM
mTests_sql_jdbc_tests sys connections SYSTEM TABLE null null
null null rowid SYSTEM
mTests_sql_jdbc_tests sys db_user_info SYSTEM TABLE null null
null null rowid SYSTEM
mTests_sql_jdbc_tests sys dependencies SYSTEM TABLE null null
null null rowid SYSTEM
@@ -74,7 +74,6 @@ mTests_sql_jdbc_tests sys idxs SYSTEM TA
mTests_sql_jdbc_tests sys keys SYSTEM TABLE null null null
null rowid SYSTEM
mTests_sql_jdbc_tests sys objects SYSTEM TABLE null null null
null rowid SYSTEM
mTests_sql_jdbc_tests sys privileges SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys queryhistory SYSTEM TABLE null null
null null rowid SYSTEM
mTests_sql_jdbc_tests sys schemas SYSTEM TABLE null null null
null rowid SYSTEM
mTests_sql_jdbc_tests sys sequences SYSTEM TABLE null null
null null rowid SYSTEM
mTests_sql_jdbc_tests sys storagemodelinput SYSTEM TABLE null
null null null rowid SYSTEM
@@ -89,9 +88,6 @@ 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 querylog SYSTEM VIEW create view
sys.querylog as
-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; 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
@@ -104,8 +100,12 @@ as select "schema","table",max(count) as
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 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
+mTests_sql_jdbc_tests querylog history VIEW 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; null null null rowid
SYSTEM
-# 20:09:14 >
-# 20:09:14 > "Done."
-# 20:09:14 >
+# 09:57:01 >
+# 09:57:01 > "Done."
+# 09:57:01 >
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
b/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
@@ -179,6 +179,14 @@ CREATE INDEX "triples_subject_object_idx
CREATE INDEX "triples_subject_predicate_idx" ON "triples" ("subject",
"predicate");
+CREATE SCHEMA "querylog";
+
+SET SCHEMA "querylog";
+
+CREATE VIEW "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;
+
COMMIT;
# 20:01:25 >
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@madrid:36834
+MAPI = (monetdb) /var/tmp/mtest-12327/.s.monetdb.30662
QUERY = insert into t1 values ((select id from tables));
-ERROR = !cardinality violation (33>1)
+ERROR = !cardinality violation (31>1)
# 16:15:09 >
# 16:15:09 > 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,8 +123,6 @@ Ready.
[ 123 ]
[ 123 ]
[ 123 ]
-[ 123 ]
-[ 123 ]
# 17:14:07 >
# 17:14:07 > "Done."
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
@@ -29,15 +29,15 @@ Ready.
% row, single_value # name
% int, char # type
% 2, 1 # length
-[ 29, "1" ]
-[ 40, "1" ]
-[ 15, "1" ]
+[ 27, "1" ]
+[ 38, "1" ]
+[ 14, "1" ]
[ 6, "1" ]
-[ 30, "1" ]
-[ 13, "1" ]
-[ 10, "1" ]
-[ 4, "1" ]
-[ 3, "1" ]
+[ 28, "1" ]
+[ 12, "1" ]
+[ 9, "1" ]
+[ 5, "1" ]
+[ 2, "1" ]
[ 19, "1" ]
# 23:16:56 >
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
