Changeset: d21e6eb71f7a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d21e6eb71f7a
Added Files:
sql/test/malloc_fail/Tests/initialize.sql
sql/test/malloc_fail/Tests/initialize.stable.err
sql/test/malloc_fail/Tests/initialize.stable.out
sql/test/malloc_fail/Tests/setmemorylimit-fail.reqtests
sql/test/malloc_fail/Tests/setmemorylimit-fail2.reqtests
sql/test/malloc_fail/Tests/setmemorylimit.reqtests
Modified Files:
sql/scripts/25_debug.sql
sql/test/malloc_fail/Tests/All
Branch: default
Log Message:
Only add setmemorylimit to catalog of databases that need it.
diffs (165 lines):
diff --git a/sql/scripts/25_debug.sql b/sql/scripts/25_debug.sql
--- a/sql/scripts/25_debug.sql
+++ b/sql/scripts/25_debug.sql
@@ -56,7 +56,3 @@ create procedure sys.flush_log ()
create function sys.debug(debug int) returns integer
external name mdb."setDebug";
-
-create procedure setmemorylimit(nbytes BIGINT)
- external name "io"."setmemorylimit";
-
diff --git a/sql/test/malloc_fail/Tests/All b/sql/test/malloc_fail/Tests/All
--- a/sql/test/malloc_fail/Tests/All
+++ b/sql/test/malloc_fail/Tests/All
@@ -1,3 +1,4 @@
+initialize
setmemorylimit
setmemorylimit-fail
setmemorylimit-fail2
diff --git a/sql/test/malloc_fail/Tests/initialize.sql
b/sql/test/malloc_fail/Tests/initialize.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/malloc_fail/Tests/initialize.sql
@@ -0,0 +1,2 @@
+create procedure setmemorylimit(nbytes BIGINT)
+ external name "io"."setmemorylimit";
diff --git a/sql/test/malloc_fail/Tests/initialize.stable.err
b/sql/test/malloc_fail/Tests/initialize.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/malloc_fail/Tests/initialize.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'initialize` in directory 'sql/test/malloc_fail` itself:
+
+
+# 14:30:10 >
+# 14:30:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38639" "--set"
"mapi_usock=/var/tmp/mtest-19224/.s.monetdb.38639" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_sql_test_malloc_fail"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 14:30:10 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-devel/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = 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 = 38639
+# cmdline opt mapi_usock = /var/tmp/mtest-19224/.s.monetdb.38639
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_sql_test_malloc_fail
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_py = true
+# cmdline opt gdk_debug = 536870922
+
+# 14:30:11 >
+# 14:30:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-19224" "--port=38639"
+# 14:30:11 >
+
+
+# 14:30:12 >
+# 14:30:12 > "Done."
+# 14:30:12 >
+
diff --git a/sql/test/malloc_fail/Tests/initialize.stable.out
b/sql/test/malloc_fail/Tests/initialize.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/malloc_fail/Tests/initialize.stable.out
@@ -0,0 +1,75 @@
+stdout of test 'initialize` in directory 'sql/test/malloc_fail` itself:
+
+
+# 14:30:10 >
+# 14:30:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38639" "--set"
"mapi_usock=/var/tmp/mtest-19224/.s.monetdb.38639" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_sql_test_malloc_fail"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 14:30:10 >
+
+# MonetDB 5 server v11.24.0 (hg id: 9a2ff0ca8d49+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_malloc_fail', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:38639/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-19224/.s.monetdb.38639
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/Python module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 14:30:11 >
+# 14:30:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-19224" "--port=38639"
+# 14:30:11 >
+
+#create procedure setmemorylimit(nbytes BIGINT)
+# external name "io"."setmemorylimit";
+
+# 14:30:12 >
+# 14:30:12 > "Done."
+# 14:30:12 >
+
diff --git a/sql/test/malloc_fail/Tests/setmemorylimit-fail.reqtests
b/sql/test/malloc_fail/Tests/setmemorylimit-fail.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/malloc_fail/Tests/setmemorylimit-fail.reqtests
@@ -0,0 +1,1 @@
+initialize
diff --git a/sql/test/malloc_fail/Tests/setmemorylimit-fail2.reqtests
b/sql/test/malloc_fail/Tests/setmemorylimit-fail2.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/malloc_fail/Tests/setmemorylimit-fail2.reqtests
@@ -0,0 +1,1 @@
+initialize
diff --git a/sql/test/malloc_fail/Tests/setmemorylimit.reqtests
b/sql/test/malloc_fail/Tests/setmemorylimit.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/malloc_fail/Tests/setmemorylimit.reqtests
@@ -0,0 +1,1 @@
+initialize
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
