Changeset: 9c6e8fc52779 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c6e8fc52779
Modified Files:
sql/test/configurable_rss/Tests/cap_rss.py
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.out
sql/test/configurable_rss/Tests/push_and_check_rss.sql
Branch: configurable_working_set
Log Message:
Change test in the hope it works on the build environment.
diffs (106 lines):
diff --git a/sql/test/configurable_rss/Tests/cap_rss.py
b/sql/test/configurable_rss/Tests/cap_rss.py
--- a/sql/test/configurable_rss/Tests/cap_rss.py
+++ b/sql/test/configurable_rss/Tests/cap_rss.py
@@ -19,7 +19,7 @@ def client(lang, file):
return clt.communicate()
def main():
- srv = server_start(["--set", "gdk_mem_maxsize=70000000"])
+ srv = server_start(["--set", "gdk_mem_maxsize=20000000"])
out, err = client('SQL',
os.path.join(os.getenv('RELSRCDIR'),
diff --git a/sql/test/configurable_rss/Tests/cap_rss.stable.out
b/sql/test/configurable_rss/Tests/cap_rss.stable.out
--- a/sql/test/configurable_rss/Tests/cap_rss.stable.out
+++ b/sql/test/configurable_rss/Tests/cap_rss.stable.out
@@ -23,18 +23,14 @@ stdout of test 'cap_rss` in directory 's
# 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 ]
+#select getrss() < 20000 as resident_set_size_is_less_then_20kbytes,
quantile(c/a, 0.8) from test;
+% .L2, sys.L6 # table_name
+% resident_set_size_is_less_then_20kbytes, L6 # name
+% boolean, double # type
+% 5, 24 # length
+[ true, 0 ]
+#drop table test cascade;
+#drop function getrss;
# MonetDB 5 server v11.30.0
# This is an unreleased version
# Serving database 'mTests_sql_test_configurable_rss', using 2 threads
diff --git a/sql/test/configurable_rss/Tests/no_cap_rss.sql
b/sql/test/configurable_rss/Tests/no_cap_rss.sql
--- a/sql/test/configurable_rss/Tests/no_cap_rss.sql
+++ b/sql/test/configurable_rss/Tests/no_cap_rss.sql
@@ -17,12 +17,10 @@ begin
end while;
end;
-call loop_insert(10000000);
+call loop_insert(1000000);
-- 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;
+select getrss() > 20000 as resident_set_size_is_bigger_then_20kbytes,
quantile(c/a, 0.8) * 0 from test;
drop table test cascade;
drop function getrss;
diff --git a/sql/test/configurable_rss/Tests/no_cap_rss.stable.out
b/sql/test/configurable_rss/Tests/no_cap_rss.stable.out
--- a/sql/test/configurable_rss/Tests/no_cap_rss.stable.out
+++ b/sql/test/configurable_rss/Tests/no_cap_rss.stable.out
@@ -41,18 +41,12 @@ Ready.
# 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 ]
+#select getrss() > 20000 as resident_set_size_is_bigger_then_20kbytes,
quantile(c/a, 0.8) from test;
+% .L2, sys.L6 # table_name
+% resident_set_size_is_bigger_then_20kbytes, L6 # name
+% boolean, double # type
+% 5, 24 # length
+[ true, 0 ]
#drop table test cascade;
#drop function getrss;
#drop function getvm;
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
@@ -17,12 +17,10 @@ begin
end while;
end;
-call loop_insert(10000000);
+call loop_insert(1000000);
-- 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_less_then_70kbytes;
+select getrss() < 20000 as resident_set_size_is_less_then_20kbytes,
quantile(c/a, 0.8) * 0 from test;
drop table test cascade;
drop function getrss;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
