Changeset: 345f839456fb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=345f839456fb
Modified Files:
monetdb5/modules/mal/clients.c
sql/test/Users/Tests/sessioncontrol.stable.err
sql/test/Users/Tests/sessioncontrol.stable.out
Branch: default
Log Message:
Move extra check from unused code to code that is actually used.
Presumably the check was at some point intended, and it makes sense:
check whether the optimizer pipeline is valid.
diffs (64 lines):
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -251,6 +251,8 @@ CLTsetoptimizer(Client cntxt, MalBlkPtr
throw(MAL,"clients.setoptimizer","Input string cannot be NULL");
if (strlen(opt) >= sizeof(mal_clients[idx].optimizer))
throw(MAL,"clients.setoptimizer","Input string is too large");
+ if (!isOptimizerPipe(opt))
+ throw(MAL, "clients.setoptimizer", "Valid optimizer pipe
expected");
MT_lock_set(&mal_contextLock);
if (mal_clients[idx].mode == FREECLIENT)
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
@@ -5,28 +5,10 @@ stderr of test 'sessioncontrol` in direc
# 18:15:20 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30383" "--set"
"mapi_usock=/var/tmp/mtest-5773/.s.monetdb.30383" "--forcemito"
"--dbpath=/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_Users"
"--set" "embedded_c=true"
# 18:15:20 >
-# builtin opt gdk_dbpath =
/export/scratch1/mk/branches/default//Linux/var/monetdb5/dbfarm/demo
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_ipv6 = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 30383
-# cmdline opt mapi_usock = /var/tmp/mtest-5773/.s.monetdb.30383
-# cmdline opt gdk_dbpath =
/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_Users
-# cmdline opt embedded_c = true
-#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
-
-# 18:15:20 >
-# 18:15:20 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5773" "--port=30383"
-# 18:15:20 >
-
-MAPI = (monetdb) /var/tmp/mtest-5773/.s.monetdb.30383
+MAPI = (monetdb) /var/tmp/mtest-1320238/.s.monetdb.32422
+QUERY = call setoptimizer('');
+ERROR = !Valid optimizer pipe expected
+MAPI = (monetdb) /var/tmp/mtest-1320238/.s.monetdb.32422
QUERY = call setsessiontimeout(-1);
ERROR = !Session timeout should be >= 0
MAPI = (monetdb) /var/tmp/mtest-61463/.s.monetdb.39827
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,9 +38,9 @@ stdout of test 'sessioncontrol` in direc
% .s, .s, .s, .s, .s, .s, .s # table_name
% sessionid, username, optimizer, sessiontimeout, querytimeout,
workerlimit, memorylimit # name
% int, clob, clob, int, int, int, int # type
-% 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;
+% 1, 7, 12, 4, 3, 2, 2 # length
+[ 0, "monetdb", "minimal_pipe", 5000, 123, 12, 10 ]
+#select sessionid, s."username", s."optimizer", s.sessiontimeout,
s.querytimeout, s.workerlimit, s.memorylimit from sessions as s;
% .s, .s, .s, .s, .s, .s, .s # table_name
% sessionid, username, optimizer, sessiontimeout, querytimeout,
workerlimit, memorylimit # name
% int, clob, clob, int, int, int, int # type
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
