Changeset: 16f716b638c0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=16f716b638c0 Added Files: sql/test/configurable_rss/Tests/cap_rss.stable.err sql/test/configurable_rss/Tests/cap_rss.stable.out sql/test/configurable_rss/Tests/no_cap_rss.sql sql/test/configurable_rss/Tests/no_cap_rss.stable.err sql/test/configurable_rss/Tests/no_cap_rss.stable.out Modified Files: sql/test/configurable_rss/Tests/All sql/test/configurable_rss/Tests/push_and_check_rss.sql Branch: configurable_working_set Log Message:
Remove unused sql function and add negative test for configurable rss feature. diffs (295 lines): diff --git a/sql/test/configurable_rss/Tests/All b/sql/test/configurable_rss/Tests/All --- a/sql/test/configurable_rss/Tests/All +++ b/sql/test/configurable_rss/Tests/All @@ -1,1 +1,2 @@ cap_rss +no_cap_rss diff --git a/sql/test/configurable_rss/Tests/cap_rss.stable.err b/sql/test/configurable_rss/Tests/cap_rss.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/configurable_rss/Tests/cap_rss.stable.err @@ -0,0 +1,31 @@ +stderr of test 'cap_rss` in directory 'sql/test/configurable_rss` itself: + + +# 20:34:03 > +# 20:34:03 > "C:\Python27\python.exe" "cap_rss.py" "cap_rss" +# 20:34:03 > + +#mserver: "--set gdk_mem_maxsize=70000000" +#client: "..\..\..\..\..\Sources\monetdb\sql\test\configurable_rss\Tests\push_and_check_rss.sql" +# builtin opt gdk_dbpath = C:\Users\aris\monetdb-installation\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 = 32637 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = C:\Users\aris\monetdb-installation\var\MonetDB\mTests_sql_test_configurable_rss +# cmdline opt gdk_mem_maxsize = 70000000 +# cmdline opt gdk_debug = 553648138 + +# 20:34:21 > +# 20:34:21 > "Done." +# 20:34:21 > + diff --git a/sql/test/configurable_rss/Tests/cap_rss.stable.out b/sql/test/configurable_rss/Tests/cap_rss.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/configurable_rss/Tests/cap_rss.stable.out @@ -0,0 +1,86 @@ +stdout of test 'cap_rss` in directory 'sql/test/configurable_rss` itself: + + +# 20:34:03 > +# 20:34:03 > "C:\Python27\python.exe" "cap_rss.py" "cap_rss" +# 20:34:03 > + +#create function getrss() +#returns bigint external name status.rss_cursize; +#create function getvm() +#returns bigint external name status.mem_cursize; +#create table test(a int, b int, c double); +#insert into test values (1, 0, 1); +[ 1 ] +#create procedure loop_insert(maximum_size bigint) +#begin +# declare size bigint; +# set size = (select count(*) from test); +# +# while size < maximum_size do +# insert into test (select a+1, b+2, rand()*c from test); +# +# set size = (select count(*) from test); +# end while; +#end; +#select count(*) as record_count from test; +% sys.L4 # table_name +% record_count # name +% bigint # type +% 8 # length +[ 16777216 ] +#select getrss() < 70000 as resident_set_size_is_less_then_70kbytes; +% .L2 # table_name +% resident_set_size_is_less_then_70kbytes # name +% boolean # type +% 5 # length +[ true ] +# MonetDB 5 server v11.30.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_configurable_rss', using 2 threads +# Compiled for x86_64-pc-winnt/64bit +# Found 8.000 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://DESKTOP-J5OE0E3:32637/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# 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: 21_dependency_views.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.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: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_profiler.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 60_wlcr.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 90_generator.sql +# loading sql script: 97_comments.sql +# loading sql script: 99_system.sql + +# 20:34:21 > +# 20:34:21 > "Done." +# 20:34:21 > + diff --git a/sql/test/configurable_rss/Tests/no_cap_rss.sql b/sql/test/configurable_rss/Tests/no_cap_rss.sql new file mode 100644 --- /dev/null +++ b/sql/test/configurable_rss/Tests/no_cap_rss.sql @@ -0,0 +1,28 @@ +create function getrss() +returns bigint external name status.rss_cursize; + +create table test(a int, b int, c double); + +insert into test values (1, 0, 1); + +create procedure loop_insert(maximum_size bigint) +begin + declare size bigint; + set size = (select count(*) from test); + + while size < maximum_size do + insert into test (select a+1, b+2, rand()*c from test); + + set size = (select count(*) from test); + end while; +end; + +call loop_insert(10000000); + +-- it seems that it requires an analytical query to keep memory in ram. +select count(*) as record_count from test; + +select getrss() > 70000 as resident_set_size_is_bigger_then_70kbytes; + +drop table test cascade; +drop function getrss; diff --git a/sql/test/configurable_rss/Tests/no_cap_rss.stable.err b/sql/test/configurable_rss/Tests/no_cap_rss.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/configurable_rss/Tests/no_cap_rss.stable.err @@ -0,0 +1,33 @@ +stderr of test 'no_cap_rss` in directory 'sql/test/configurable_rss` itself: + + +# 20:52:50 > +# 20:52:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31687" "--set" "monet_prompt=" "--forcemito" "--dbpath=C:\Users\aris\monetdb-installation\var\MonetDB\mTests_sql_test_configurable_rss" +# 20:52:50 > + +# builtin opt gdk_dbpath = C:\Users\aris\monetdb-installation\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 = 31687 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = C:\Users\aris\monetdb-installation\var\MonetDB\mTests_sql_test_configurable_rss +# cmdline opt gdk_debug = 553648138 + +# 20:52:51 > +# 20:52:51 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=DESKTOP-J5OE0E3" "--port=31687" +# 20:52:51 > + + +# 20:53:00 > +# 20:53:00 > "Done." +# 20:53:00 > + diff --git a/sql/test/configurable_rss/Tests/no_cap_rss.stable.out b/sql/test/configurable_rss/Tests/no_cap_rss.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/configurable_rss/Tests/no_cap_rss.stable.out @@ -0,0 +1,63 @@ +stdout of test 'no_cap_rss` in directory 'sql/test/configurable_rss` itself: + + +# 20:52:50 > +# 20:52:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31687" "--set" "monet_prompt=" "--forcemito" "--dbpath=C:\Users\aris\monetdb-installation\var\MonetDB\mTests_sql_test_configurable_rss" +# 20:52:50 > + +# MonetDB 5 server v11.30.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_configurable_rss', using 2 threads +# Compiled for x86_64-pc-winnt/64bit +# Found 8.000 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://DESKTOP-J5OE0E3:31687/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 20:52:51 > +# 20:52:51 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=DESKTOP-J5OE0E3" "--port=31687" +# 20:52:51 > + +#create function getrss() +#returns bigint external name status.rss_cursize; +#create function getvm() +#returns bigint external name status.mem_cursize; +#create table test(a int, b int, c double); +#insert into test values (1, 0, 1); +[ 1 ] +#create procedure loop_insert(maximum_size bigint) +#begin +# declare size bigint; +# set size = (select count(*) from test); +# +# while size < maximum_size do +# insert into test (select a+1, b+2, rand()*c from test); +# +# set size = (select count(*) from test); +# end while; +#end; +#select count(*) as record_count from test; +% sys.L4 # table_name +% record_count # name +% bigint # type +% 8 # length +[ 16777216 ] +#select getrss() > 70000 as resident_set_size_is_bigger_then_70kbytes; +% .L2 # table_name +% resident_set_size_is_bigger_then_70kbytes # name +% boolean # type +% 5 # length +[ true ] +#drop table test cascade; +#drop function getrss; +#drop function getvm; + +# 20:53:00 > +# 20:53:00 > "Done." +# 20:53:00 > + diff --git a/sql/test/configurable_rss/Tests/push_and_check_rss.sql b/sql/test/configurable_rss/Tests/push_and_check_rss.sql --- a/sql/test/configurable_rss/Tests/push_and_check_rss.sql +++ b/sql/test/configurable_rss/Tests/push_and_check_rss.sql @@ -1,9 +1,6 @@ create function getrss() returns bigint external name status.rss_cursize; -create function getvm() -returns bigint external name status.mem_cursize; - create table test(a int, b int, c double); insert into test values (1, 0, 1); @@ -25,6 +22,7 @@ call loop_insert(10000000); -- it seems that it requires an analytical query to keep memory in ram. select count(*) as record_count from test; -select getrss() as resident_set_size; +select getrss() < 70000 as resident_set_size_is_less_then_70kbytes; -select getrss() < 70000 as resident_set_size_is_less_then_70kbytes; +drop table test cascade; +drop function getrss; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
