Changeset: 7dd5531d5258 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7dd5531d5258
Modified Files:
monetdb5/mal/Tests/tst025.stable.out
monetdb5/mal/Tests/tst032.stable.out
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/Tests/tst810.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
Branch: default
Log Message:
Approve output
diffs (197 lines):
diff --git a/monetdb5/mal/Tests/tst025.stable.out
b/monetdb5/mal/Tests/tst025.stable.out
--- a/monetdb5/mal/Tests/tst025.stable.out
+++ b/monetdb5/mal/Tests/tst025.stable.out
@@ -50,7 +50,7 @@ end user.main;
# void int # type
#--------------------------#
[ 0@0, 5140046 ]
-[ 2@0, 5645862 ]
+[ 1@0, 5645862 ]
#--------------------------#
# t t # name
# void int # type
diff --git a/monetdb5/mal/Tests/tst032.stable.out
b/monetdb5/mal/Tests/tst032.stable.out
--- a/monetdb5/mal/Tests/tst032.stable.out
+++ b/monetdb5/mal/Tests/tst032.stable.out
@@ -57,7 +57,7 @@ end user.main;
# oid int # type
#--------------------------#
[ 0@0, 0 ]
-[ 2@0, 2 ]
+[ 1@0, 2 ]
# 22:30:08 >
# 22:30:08 > Done.
diff --git a/monetdb5/mal/Tests/tst201.stable.out
b/monetdb5/mal/Tests/tst201.stable.out
--- a/monetdb5/mal/Tests/tst201.stable.out
+++ b/monetdb5/mal/Tests/tst201.stable.out
@@ -87,10 +87,10 @@ end user.main;
# h t # name
# oid str # type
#--------------------------#
-[ 10@0, "" ]
+[ 0@0, "" ]
[ 1@0, "quick" ]
[ 2@0, "brown" ]
-[ 11@0, nil ]
+[ 3@0, nil ]
[ 4@0, "jumps" ]
[ 5@0, "over" ]
[ 6@0, "lazy" ]
@@ -101,49 +101,49 @@ end user.main;
# t h # name
# void str # type
#--------------------------#
-[ 2@0, "brown" ]
+[ 0@0, "brown" ]
#--------------------------#
# t h # name
# void str # type
#--------------------------#
-[ 10@0, "" ]
-[ 11@0, nil ]
-[ 7@0, "dog" ]
-[ 8@0, nil ]
-[ 12@0, "fox" ]
-[ 13@0, "the" ]
-[ 14@0, "." ]
+[ 0@0, "" ]
+[ 1@0, nil ]
+[ 2@0, "dog" ]
+[ 3@0, nil ]
+[ 4@0, "fox" ]
+[ 5@0, "the" ]
+[ 6@0, "." ]
#--------------------------#
# t t # name
# void str # type
#--------------------------#
-[ 10@0, "" ]
+[ 0@0, "" ]
[ 1@0, "quick" ]
[ 2@0, "brown" ]
-[ 11@0, nil ]
+[ 3@0, nil ]
[ 4@0, "jumps" ]
[ 5@0, "over" ]
[ 6@0, "lazy" ]
[ 7@0, "dog" ]
[ 8@0, nil ]
-[ 12@0, "fox" ]
-[ 13@0, "the" ]
-[ 14@0, "." ]
+[ 9@0, "fox" ]
+[ 10@0, "the" ]
+[ 11@0, "." ]
#--------------------------#
# t t # name
# void str # type
#--------------------------#
-[ 12@0, "fox" ]
+[ 0@0, "fox" ]
#--------------------------#
# h t # name
# oid str # type
#--------------------------#
-[ 12@0, "fox" ]
+[ 0@0, "fox" ]
#--------------------------#
# h t # name
# oid str # type
#--------------------------#
-[ 12@0, "fox" ]
+[ 0@0, "fox" ]
#--------------------------#
# h t # name
# oid str # type
diff --git a/monetdb5/mal/Tests/tst810.stable.out
b/monetdb5/mal/Tests/tst810.stable.out
--- a/monetdb5/mal/Tests/tst810.stable.out
+++ b/monetdb5/mal/Tests/tst810.stable.out
@@ -59,11 +59,11 @@ end user.main;
# t h # name
# void int # type
#--------------------------#
-[ 4@0, 5 ]
-[ 5@0, 6 ]
-[ 6@0, 7 ]
-[ 7@0, 8 ]
-[ 8@0, 9 ]
+[ 0@0, 5 ]
+[ 1@0, 6 ]
+[ 2@0, 7 ]
+[ 3@0, 8 ]
+[ 4@0, 9 ]
# 16:18:09 >
# 16:18:09 > "Done."
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -54,12 +54,12 @@ Operation successful
| X_2 := sql.mvc(); |
| X_9:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
| X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables"); |
-| X_55 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
+| X_57 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_56 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
+| X_58 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
| X_15:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1);
|
-| X_58 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
-| X_18 := sql.subdelta(X_55,X_6,X_12,X_56,X_58);
|
+| X_60 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
+| X_18 := sql.subdelta(X_57,X_6,X_12,X_58,X_60);
|
| X_19:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0);
|
| (X_21,r1_24) := sql.bind(X_2,"sys","_tables","id",2);
|
| X_23:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1);
|
diff --git a/sql/test/Tests/setoptimizer.stable.err
b/sql/test/Tests/setoptimizer.stable.err
--- a/sql/test/Tests/setoptimizer.stable.err
+++ b/sql/test/Tests/setoptimizer.stable.err
@@ -79,11 +79,11 @@ stderr of test 'setoptimizer` in directo
# 12:49:31 > mclient -lsql -i --host=eir --port=36907
# 12:49:31 >
-MAPI = (monetdb) /var/tmp/mtest-24264/.s.monetdb.39693
+MAPI = (monetdb) /var/tmp/mtest-22321/.s.monetdb.32284
QUERY = set optimizer=' optimizer.inline(); optimizer.remap();
optimizer.evaluate(); optimizer.costModel(); optimizer.coercions();
optimizer.emptySet(); optimizer.aliases(); optimizer.mergetable();
optimizer.deadcode(); optimizer.commonTerms(); optimizer.joinPath();
optimizer.reorder(); optimizer.deadcode(); optimizer.reduce();
optimizer.querylog(); optimizer.multiplex(); optimizer.accumulators();
optimizer.garbageCollector();';
ERROR = !TypeException:user.main[6]:'optimizer.emptySet' undefined in:
optimizer.emptySet();
!Semantic errors detected
-MAPI = (monetdb) /var/tmp/mtest-24264/.s.monetdb.39693
+MAPI = (monetdb) /var/tmp/mtest-22321/.s.monetdb.32284
QUERY = set optimizer='myfamous_pipe';
ERROR = !optimizer 'myfamous_pipe' unknown
diff --git a/sql/test/Tests/setoptimizer.stable.out
b/sql/test/Tests/setoptimizer.stable.out
--- a/sql/test/Tests/setoptimizer.stable.out
+++ b/sql/test/Tests/setoptimizer.stable.out
@@ -64,12 +64,11 @@ Ready.
% ., ., . # table_name
% name, def, status # name
% clob, clob, clob # type
-% 15, 512, 6 # length
+% 15, 491, 6 # length
[ "minimal_pipe",
"optimizer.inline();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
[ "default_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
[ "sequential_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
-[ "recycler_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.aliases();optimizer.deadcode();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.recycler();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
# 02:57:35 >
# 02:57:35 > "Done."
diff --git a/sql/test/Tests/setoptimizer.stable.out.Windows
b/sql/test/Tests/setoptimizer.stable.out.Windows
--- a/sql/test/Tests/setoptimizer.stable.out.Windows
+++ b/sql/test/Tests/setoptimizer.stable.out.Windows
@@ -64,12 +64,11 @@ Ready.
% ., ., . # table_name
% name, def, status # name
% clob, clob, clob # type
-% 15, 512, 6 # length
+% 15, 491, 6 # length
[ "minimal_pipe",
"optimizer.inline();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
[ "default_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
[ "sequential_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
-[ "recycler_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.aliases();optimizer.deadcode();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.recycler();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
# 13:03:42 >
# 13:03:42 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
