Changeset: 4b256c26e904 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b256c26e904
Added Files:
sql/test/Tests/sessioncontrol.sql
sql/test/Tests/sessioncontrol.test
Removed Files:
sql/test/Users/Tests/sessioncontrol.sql
sql/test/Users/Tests/sessioncontrol.stable.err
sql/test/Users/Tests/sessioncontrol.stable.out
sql/test/Users/Tests/sessioncontrol.test
Modified Files:
sql/test/Tests/All
sql/test/Users/Tests/All
Branch: default
Log Message:
The test 'sessioncontrol' has nothing to do with users and privileges, so moved
it to join the other session test.
diffs (114 lines):
diff --git a/sql/test/Tests/All b/sql/test/Tests/All
--- a/sql/test/Tests/All
+++ b/sql/test/Tests/All
@@ -75,6 +75,7 @@ psm
outerref_in_selection
session_vars
+sessioncontrol
add_column_with_seq
zones
diff --git a/sql/test/Users/Tests/sessioncontrol.sql
b/sql/test/Tests/sessioncontrol.sql
rename from sql/test/Users/Tests/sessioncontrol.sql
rename to sql/test/Tests/sessioncontrol.sql
diff --git a/sql/test/Users/Tests/sessioncontrol.test
b/sql/test/Tests/sessioncontrol.test
rename from sql/test/Users/Tests/sessioncontrol.test
rename to sql/test/Tests/sessioncontrol.test
diff --git a/sql/test/Users/Tests/All b/sql/test/Users/Tests/All
--- a/sql/test/Users/Tests/All
+++ b/sql/test/Users/Tests/All
@@ -13,6 +13,5 @@ grantMonetdb
copyinto
schemaRights
metadataConsistency
-sessioncontrol
createUserRollback
userCallFunction
diff --git a/sql/test/Users/Tests/sessioncontrol.stable.err
b/sql/test/Users/Tests/sessioncontrol.stable.err
deleted file mode 100644
--- a/sql/test/Users/Tests/sessioncontrol.stable.err
+++ /dev/null
@@ -1,24 +0,0 @@
-stderr of test 'sessioncontrol` in directory 'sql/test/Users` itself:
-
-
-# 18:15:20 >
-# 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 >
-
-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
-QUERY = call setquerytimeout(-1);
-ERROR = !Query timeout should be >= 0
-MAPI = (monetdb) /var/tmp/mtest-61463/.s.monetdb.39827
-QUERY = call setworkerlimit( -1);
-ERROR = !The number of workers cannot be negative
-
-# 18:15:20 >
-# 18:15:20 > "Done."
-# 18:15:20 >
-
diff --git a/sql/test/Users/Tests/sessioncontrol.stable.out
b/sql/test/Users/Tests/sessioncontrol.stable.out
deleted file mode 100644
--- a/sql/test/Users/Tests/sessioncontrol.stable.out
+++ /dev/null
@@ -1,53 +0,0 @@
-stdout of test 'sessioncontrol` in directory 'sql/test/Users` itself:
-
-
-# 18:15:20 >
-# 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 >
-
-# MonetDB 5 server v11.36.0 (hg id: 160567eeb3fb+)
-# This is an unreleased version
-# Serving database 'mTests_sql_test_Users', using 4 threads
-# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
-# Found 31.307 GiB available main-memory.
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://toke.da.cwi.nl:30383/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5773/.s.monetdb.30383
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-# 18:15:20 >
-# 18:15:20 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5773" "--port=30383"
-# 18:15:20 >
-
-#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, username, optimizer, sessiontimeout, querytimeout,
workerlimit, memorylimit # name
-% int, clob, clob, int, int, int, int # type
-% 1, 7, 12, 1, 1, 1, 1 # length
-[ 0, "monetdb", "default_pipe", 0, 0, 0, 0 ]
-#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, username, optimizer, sessiontimeout, querytimeout,
workerlimit, memorylimit # name
-% int, clob, clob, int, int, int, int # type
-% 1, 7, 12, 4, 3, 2, 4 # length
-[ 0, "monetdb", "minimal_pipe", 5000, 123, 12, 8000 ]
-#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, username, optimizer, sessiontimeout, querytimeout,
workerlimit, memorylimit # name
-% int, clob, clob, int, int, int, int # type
-% 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
-% 1, 7, 15, 4, 2, 1, 4 # length
-[ 0, "monetdb", "sequential_pipe", 1000, 60, 8, 2000
]
-
-# 18:15:20 >
-# 18:15:20 > "Done."
-# 18:15:20 >
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
