Changeset: a6228f40f25d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6228f40f25d
Modified Files:
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
sql/test/Users/Tests/sessioncontrol.stable.err
sql/test/Users/Tests/sessioncontrol.stable.out
Branch: default
Log Message:
Approved output
diffs (56 lines):
diff --git
a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
---
a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
+++
b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
@@ -34,7 +34,7 @@ stdout of test 'duplicates-not-eliminate
% 1023 # length
function user.s4_0():void;
X_142:void := querylog.define("explain select sys.timestamp_to_str(case
when task0.\"sys_created_on\" >= \\'1999-10-31 09:00:00\\' and
task0.\"sys_created_on\" < \\'2000-04-02 10:00:00\\' then
task0.\"sys_created_on\" + interval \\'-28800\\' second when
task0.\"sys_created_on\" >= \\'2000-04-02 10:00:00\\' and
task0.\"sys_created_on\" < \\'2000-10-29 09:00:00\\' then
task0.\"sys_created_on\" + interval \\'-25200\\' second when
task0.\"sys_created_on\" >= \\'2000-10-29 09:00:00\\' and
task0.\"sys_created_on\" < \\'2001-04-01 10:00:00\\' then
task0.\"sys_created_on\" + interval \\'-28800\\' second when
task0.\"sys_created_on\" >= \\'2001-04-01 10:00:00\\' and
task0.\"sys_created_on\" < \\'2001-10-28 09:00:00\\' then
task0.\"sys_created_on\" + interval \\'-25200\\' second when
task0.\"sys_created_on\" >= \\'2001-10-28 09:00:00\\' and
task0.\"sys_created_on\" < \\'2002-04-07 10:00:00\\' then
task0.\"sys_created_on\" + interval \\'-28800\\' second when
task0.\"sys_created_on\" >= \\'
2002-04-07 10:00:00\\' and
-barrier X_1765:bit := language.dataflow();
+barrier X_1766:bit := language.dataflow();
X_1608:bat[:str] := bat.pack("sys.L1":str);
X_1609:bat[:str] := bat.pack("yearref":str);
X_1610:bat[:str] := bat.pack("clob":str);
@@ -276,7 +276,7 @@ barrier X_1765:bit := language.dataflow(
language.pass(X_1436:bat[:bit]);
language.pass(X_1458:bat[:timestamp]);
language.pass(X_1454:bat[:timestamp]);
-exit X_1765:bit;
+exit X_1766:bit;
sql.resultSet(X_1608:bat[:str], X_1609:bat[:str], X_1610:bat[:str],
X_1611:bat[:int], X_1611:bat[:int], X_1604:bat[:str]);
end user.s4_0;
#inline actions= 0 time=24 usec
diff --git a/sql/test/Users/Tests/sessioncontrol.stable.err
b/sql/test/Users/Tests/sessioncontrol.stable.err
--- a/sql/test/Users/Tests/sessioncontrol.stable.err
+++ b/sql/test/Users/Tests/sessioncontrol.stable.err
@@ -21,7 +21,6 @@ stderr of test 'sessioncontrol` in direc
#client2:!ERROR:MALException:sessiontimeout:Session time-out should be >= 0
#client2:!ERROR:MALException:querytimeout:Query time-out should be >= 0
#client2:!ERROR:MALException:setworkerlimit:At least one worker needed
-#client2:!ERROR:MALException:setmemorylimit:At least 100 MB needed
# 18:15:20 >
# 18:15:20 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5773" "--port=30383"
@@ -36,9 +35,6 @@ ERROR = !Query time-out should be >= 0
MAPI = (monetdb) /var/tmp/mtest-5773/.s.monetdb.30383
QUERY = call setworkerlimit( -1);
ERROR = !At least one worker needed
-MAPI = (monetdb) /var/tmp/mtest-5773/.s.monetdb.30383
-QUERY = call setmemorylimit(10);
-ERROR = !At least 100 MB needed
# 18:15:20 >
# 18:15:20 > "Done."
diff --git a/sql/test/Users/Tests/sessioncontrol.stable.out
b/sql/test/Users/Tests/sessioncontrol.stable.out
--- a/sql/test/Users/Tests/sessioncontrol.stable.out
+++ b/sql/test/Users/Tests/sessioncontrol.stable.out
@@ -38,8 +38,8 @@ stdout of test 'sessioncontrol` in direc
% .s, .s, .s, .s, .s, .s, .s # table_name
% sessionid, user, optimizer, sessiontimeout, querytimeout,
workerlimit, memorylimit # name
% int, clob, clob, int, int, int, int # type
-% 1, 7, 0, 4, 3, 2, 4 # length
-[ 0, "monetdb", "", 5000, 123, 12, 8000 ]
+% 1, 7, 0, 4, 3, 2, 2 # length
+[ 0, "monetdb", "", 5000, 123, 12, 10 ]
#select sessionid, s."user", s."optimizer", s.sessiontimeout, s.querytimeout,
s.workerlimit, s.memorylimit from sessions as s;
% .s, .s, .s, .s, .s, .s, .s # table_name
% sessionid, user, optimizer, sessiontimeout, querytimeout,
workerlimit, memorylimit # name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
