Changeset: 91ef6d99f11a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91ef6d99f11a
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
Branch: Mar2018
Log Message:
Approve Windows-specific output.
diffs (88 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -57,20 +57,17 @@ Ready.
#set optimizer = 'sequential_pipe'; -- to get predictable errors
#create table ttt (a int, b int, c int);
#select optimizer;
-% . # table_name
-# .L2 # table_name
-% L # name
-# L2 # name
+% .L2 # table_name
+% L2 # name
% varchar # type
% 15 # length
[ "sequential_pipe" ]
#select def from optimizers() where name = optimizer;
-% . # table_name
-# .L1 # table_name
+% .L1 # table_name
% def # name
% clob # type
-% 519 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.wlc();optimizer.garbageCollector();"
]
+% 560 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();"
]
#explain copy into ttt from 'a:\tmp/xyz';
% .explain # table_name
% mal # name
@@ -115,20 +112,17 @@ end user.s10_1;
#set opt_pipe_def = ( select def from optimizers() where name = opt_pipe_name
);
#set optimizer =
substring(opt_pipe_def,0,length(opt_pipe_def)-length('optimizer.garbageCollector();'))
|| 'optimizer.sql_append();optimizer.garbageCollector();';
#select optimizer;
-% . # table_name
-# .L2 # table_name
-% L # name
-# L2 # name
+% .L2 # table_name
+% L2 # name
% varchar # type
% 6 # length
[ "user_1" ]
#select def from optimizers() where name = optimizer;
-% . # table_name
-# .L1 # table_name
+% .L1 # table_name
% def # name
% clob # type
-% 542 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.wlc();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 583 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from 'Z:/tmp/xyz';
% .explain # table_name
% mal # name
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
@@ -70,11 +70,11 @@ Ready.
% .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3 # table_name
% schema, table, column, type, mode, typewidth, hashes, phash,
imprints # name
% clob, clob, clob, clob, clob, int, bigint, boolean,
bigint # type
-% 3, 7, 13, 8, 8, 2, 1, 5, 1 # length
+% 3, 7, 13, 8, 8, 3, 1, 5, 1 # length
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0 ]
-[ "sys", "_tables", "name", "varchar", "writable", 9,
0, false, 0 ]
+[ "sys", "_tables", "name", "varchar", "writable", 15,
0, false, 0 ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0 ]
-[ "sys", "_tables", "query", "varchar", "writable",
66, 0, false, 0 ]
+[ "sys", "_tables", "query", "varchar", "writable",
234, 0, false, 0 ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0 ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0 ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0 ]
@@ -95,11 +95,11 @@ Ready.
% .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3 # table_name
% schema, table, column, type, mode, typewidth, hashes, phash,
imprints # name
% clob, clob, clob, clob, clob, int, bigint, boolean,
bigint # type
-% 3, 7, 13, 8, 8, 2, 1, 5, 1 # length
+% 3, 7, 13, 8, 8, 3, 1, 5, 1 # length
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0 ]
-[ "sys", "_tables", "name", "varchar", "writable", 9,
0, false, 0 ]
+[ "sys", "_tables", "name", "varchar", "writable", 15,
0, false, 0 ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0 ]
-[ "sys", "_tables", "query", "varchar", "writable",
65, 0, false, 0 ]
+[ "sys", "_tables", "query", "varchar", "writable",
231, 0, false, 0 ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0 ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0 ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
