Changeset: b4a900a77646 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b4a900a77646
Removed Files:
monetdb5/mal/Tests/recycle04.mal
monetdb5/mal/Tests/recycle04.stable.err
monetdb5/mal/Tests/recycle04.stable.out
monetdb5/mal/Tests/recycle13.mal
monetdb5/mal/Tests/recycle13.stable.err
monetdb5/mal/Tests/recycle13.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/recycle00.mal
monetdb5/mal/Tests/recycle01.mal
monetdb5/mal/Tests/recycle02.mal
monetdb5/mal/Tests/recycle03.mal
monetdb5/mal/Tests/recycle05.mal
monetdb5/mal/Tests/recycle06.mal
monetdb5/mal/Tests/recycle07.mal
monetdb5/mal/Tests/recycle08.mal
monetdb5/mal/Tests/recycle09.mal
monetdb5/mal/Tests/recycle10.mal
monetdb5/mal/Tests/recycle11.mal
monetdb5/mal/Tests/recycle12.mal
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_recycle.h
monetdb5/modules/mal/recycle.c
monetdb5/modules/mal/recycle.h
monetdb5/modules/mal/recycle.mal
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
Branch: default
Log Message:
Phase of recycler cleanup
We decided to focus the code base on ADM_ALL, REUSE_COVER, and RCACHE_PROFIT
from the old experimental code. All other code is moved to the attic.
diffs (truncated from 2240 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -234,7 +234,6 @@ recycle00
recycle01
recycle02
recycle03
-recycle04
recycle05
recycle06
recycle07
@@ -242,7 +241,6 @@ recycle08
recycle10
recycle11
recycle12
-recycle13
venks
saveload
diff --git a/monetdb5/mal/Tests/recycle00.mal b/monetdb5/mal/Tests/recycle00.mal
--- a/monetdb5/mal/Tests/recycle00.mal
+++ b/monetdb5/mal/Tests/recycle00.mal
@@ -8,7 +8,6 @@ end qry;
optimizer.recycler("user","qry");
mdb.List("user","qry");
-recycle.setAdmPolicy(1);
io.print("start");
qry();
io.print("next");
diff --git a/monetdb5/mal/Tests/recycle01.mal b/monetdb5/mal/Tests/recycle01.mal
--- a/monetdb5/mal/Tests/recycle01.mal
+++ b/monetdb5/mal/Tests/recycle01.mal
@@ -39,8 +39,6 @@ function qry(low:int, hgh:int);
s:= algebra.subselect(b,x,low,hgh,true,true,false);
end qry;
-recycle.setAdmPolicy(1);
-recycle.setReusePolicy(1);
optimizer.recycler("user","qry");
mdb.list("user","qry");
io.print("start");
diff --git a/monetdb5/mal/Tests/recycle02.mal b/monetdb5/mal/Tests/recycle02.mal
--- a/monetdb5/mal/Tests/recycle02.mal
+++ b/monetdb5/mal/Tests/recycle02.mal
@@ -41,8 +41,6 @@ function qry(low:int, hgh:int);
io.print(j);
end qry;
-recycle.setAdmPolicy(2,2);
-recycle.setReusePolicy(1);
optimizer.recycler("user","qry");
mdb.list("user","qry");
io.print("start");
diff --git a/monetdb5/mal/Tests/recycle03.mal b/monetdb5/mal/Tests/recycle03.mal
--- a/monetdb5/mal/Tests/recycle03.mal
+++ b/monetdb5/mal/Tests/recycle03.mal
@@ -40,8 +40,6 @@ function qry(low:int, hgh:int);
io.print(j);
end qry;
-recycle.setAdmPolicy(3,1);
-recycle.setReusePolicy(1);
optimizer.recycler("user","qry");
mdb.list("user","qry");
io.print("start");
diff --git a/monetdb5/mal/Tests/recycle04.mal b/monetdb5/mal/Tests/recycle04.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle04.mal
+++ /dev/null
@@ -1,54 +0,0 @@
-#test the basics of the recycler
-#check retention of function calls
-module sql;
-function sql.mvc():int;
- return mvc:=1;
-end mvc;
-
-function sql.tid(mvc:int,s:str,t:str):bat[:oid,:oid];
-b:= bat.new(:oid,:oid);
-barrier i:= 0:oid;
- bat.append(b,i);
- redo i:= iterator.next(1:oid,11:oid);
-exit i;
- return tid:= b;
-end tid;
-
-function sql.bind(m:int,s:str,t:str,c:str,i:int):bat[:oid,:int];
- b:= bat.new(:oid,:int);
- bat.insert(b,0@0,0);
- bat.insert(b,1@0,1);
- bat.insert(b,2@0,2);
- bat.insert(b,3@0,3);
- bat.insert(b,4@0,4);
- bat.insert(b,5@0,5);
- bat.insert(b,6@0,6);
- bat.insert(b,7@0,7);
- bat.insert(b,8@0,8);
- bat.insert(b,9@0,9);
- bat.insert(b,10@0,10);
- bat.insert(b,11@0,11);
- return bind:=b;
-end bind;
-
-function qry(low:int, hgh:int);
- m:= sql.mvc();
- x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
- b:bat[:oid,:int]:= sql.bind(m,"sys","tbl","col",0);
- s1:= algebra.subselect(b,x,low,hgh,true,true,false);
- return qry:=s1;
-end qry;
-
-function tst();
- qry(1,10);
- qry(1,10);
- qry(1,10);
-end tst;
-
-optimizer.recycler("user","qry");
-optimizer.recycler("user","tst");
-mdb.List("user","qry");
-mdb.List("user","tst");
-recycle.setReusePolicy(2);
-user.tst();
-recycle.dump();
diff --git a/monetdb5/mal/Tests/recycle04.stable.err
b/monetdb5/mal/Tests/recycle04.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle04.stable.err
+++ /dev/null
@@ -1,14 +0,0 @@
-stderr of test 'recycle04` in directory 'monetdb5/mal` itself:
-
-
-# 09:13:42 >
-# 09:13:42 > mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set mapi_open=true
--set xrpc_open=true --set mapi_port=32298 --set xrpc_port=45688 --set
monet_prompt= --trace --dbname=mTests_src_mal recycle04.mal
-# 09:13:42 >
-
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
-
-# 09:13:42 >
-# 09:13:42 > Done.
-# 09:13:42 >
-
diff --git a/monetdb5/mal/Tests/recycle04.stable.out
b/monetdb5/mal/Tests/recycle04.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle04.stable.out
+++ /dev/null
@@ -1,117 +0,0 @@
-stdout of test 'recycle04` in directory 'monetdb5/mal` itself:
-
-
-# 09:13:42 >
-# 09:13:42 > mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set mapi_open=true
--set xrpc_open=true --set mapi_port=32298 --set xrpc_port=45688 --set
monet_prompt= --trace --dbname=mTests_src_mal recycle04.mal
-# 09:13:42 >
-
-# MonetDB server v5.7.0, based on kernel v1.25.0
-# Serving database 'mTests_src_mal'
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32298/
-##test the basics of the recycler
-##check retention of function calls
-#
-#function user.bind(s:str,t:str,c:str,i:int):bat[:oid,:int];
-# b:= bat.new(:oid,:int);
-# bat.insert(b,0@0,0);
-# bat.insert(b,1@0,1);
-# bat.insert(b,2@0,2);
-# bat.insert(b,3@0,3);
-# bat.insert(b,4@0,4);
-# bat.insert(b,5@0,5);
-# bat.insert(b,6@0,6);
-# bat.insert(b,7@0,7);
-# bat.insert(b,8@0,8);
-# bat.insert(b,9@0,9);
-# bat.insert(b,10@0,10);
-# bat.insert(b,11@0,11);
-# return bind:=b;
-#end bind;
-function user.bind(s:str,t:str,c:str,i:int):bat[:oid,:int];
- b := bat.new(:oid,:int);
- bat.insert(b,0@0,0);
- bat.insert(b,1@0,1);
- bat.insert(b,2@0,2);
- bat.insert(b,3@0,3);
- bat.insert(b,4@0,4);
- bat.insert(b,5@0,5);
- bat.insert(b,6@0,6);
- bat.insert(b,7@0,7);
- bat.insert(b,8@0,8);
- bat.insert(b,9@0,9);
- bat.insert(b,10@0,10);
- bat.insert(b,11@0,11);
- return bind := b;
-end bind;
-#
-#function qry(low:int, hgh:int):bat[:oid,:int];
-# b:= user.bind("schema","table","column",0);
-# s1:= algebra.select(b,low,hgh);
-# return qry:=s1;
-#end qry;
-function user.qry(low:int,hgh:int):bat[:oid,:int];
- b := user.bind("schema","table","column",0);
- s1 := algebra.select(b,low,hgh);
- return qry := s1;
-end qry;
-#
-#function tst();
-# qry(1,10);
-# qry(1,10);
-# qry(1,10);
-#end tst;
-function user.tst():void;
- user.qry(1,10);
- user.qry(1,10);
- user.qry(1,10);
-end tst;
-#
-#optimizer.recycle("user","qry");
-#optimizer.recycle("user","tst");
-#mdb.List("user","qry");
-#mdb.List("user","tst");
-#recycle.setReusePolicy(2);
-#user.tst();
-#recycle.dump();
-#
-function user.main():void;
-#test the basics of the recycler
-#check retention of function calls
- mdb.List("user","qry");
- mdb.List("user","tst");
- recycle.setReusePolicy(2);
- user.tst();
- recycle.dump();
-end main;
-function user.qry(low:int,hgh:int):bat[:oid,:int];# 0 qry:bat[:oid,:int] :=
user.qry(low:int, hgh:int) {G}
- recycle.prelude(); # 1 _9:void := RECYCLEprelude()
- b := user.bind("schema","table","column",0);# 2 b:bat[:oid,:int] :=
user.bind(_4:str, _5:str, _6:str, _7:int) {GR}
- s1 := algebra.select(b,low,hgh); # 3 s1:bat[:oid,:int] :=
ALGselect(b:bat[:oid,:int], low:int, hgh:int) {GR}
- recycle.epilogue(); # 4 _10:void := RECYCLEepilogue()
- return qry := s1; # 5 qry:bat[:oid,:int] :=
s1:bat[:oid,:int] {G}
-end qry; # 6
-function user.tst():void; # 0 tst:void := user.tst() {G}
- recycle.prelude(); # 1 _6:void := RECYCLEprelude()
- user.qry(1,10); # 2 _1:bat[:oid,:int] :=
user.qry(_2:int, _3:int) {GR}
- user.qry(1,10); # 3 _4:bat[:oid,:int] :=
user.qry(_2:int, _3:int) {GR}
- user.qry(1,10); # 4 _5:bat[:oid,:int] :=
user.qry(_2:int, _3:int) {GR}
- recycle.epilogue(); # 5 _7:void := RECYCLEepilogue()
-end tst; # 6
-#Recycler catalog
-#retain= 1 time =0 sze= 0 alpha= 0.500
-#reuse= 2
-#rcache= 1 limit= 1000
-#hard stmt = 4000 hard var = 25000 hard mem= 8388608
-#recycled = 2 statements = 7 saved time(ms)= 0.20 memory(KB)= 0
-# 0 lru= 0 cnt= 0 ticks= 0 rd= 0 wr=
0 function user.recycler():any;
-# 1 lru= 432457 cnt= 1 ticks= 53 rd= 0 wr=
0 _1 := user.bind("schema","table","column",0);
-# 2 lru= 432500 cnt= 1 ticks= 43 rd= 0 wr=
0 _6 := algebra.select(<tmp_20>,1,10);
-# 3 lru= 432508 cnt= 3 ticks= 101 rd= 0 wr=
0 _6 := user.qry(1,10);
-
-# 09:13:42 >
-# 09:13:42 > Done.
-# 09:13:42 >
-
diff --git a/monetdb5/mal/Tests/recycle05.mal b/monetdb5/mal/Tests/recycle05.mal
--- a/monetdb5/mal/Tests/recycle05.mal
+++ b/monetdb5/mal/Tests/recycle05.mal
@@ -30,9 +30,7 @@ function qry(low:int, hgh:int);
s1:= algebra.select(b,low,hgh);
end qry;
-recycle.setAdmPolicy(1);
-recycle.setReusePolicy(1);
-recycle.setCachePolicy(1,10,12);
+recycle.setCachePolicy(10,12,0.5);
optimizer.recycle.("user","qry");
io.print("start");
diff --git a/monetdb5/mal/Tests/recycle06.mal b/monetdb5/mal/Tests/recycle06.mal
--- a/monetdb5/mal/Tests/recycle06.mal
+++ b/monetdb5/mal/Tests/recycle06.mal
@@ -29,9 +29,7 @@ function qry(low:int, hgh:int);
s1:= algebra.subselect(b,x,low,hgh,true,true,false);
end qry;
-recycle.setAdmPolicy(1);
-recycle.setReusePolicy(1);
-recycle.setCachePolicy(1,9);
+recycle.setCachePolicy(9,10,0.5);
optimizer.recycler("user","qry");
io.print("start");
diff --git a/monetdb5/mal/Tests/recycle07.mal b/monetdb5/mal/Tests/recycle07.mal
--- a/monetdb5/mal/Tests/recycle07.mal
+++ b/monetdb5/mal/Tests/recycle07.mal
@@ -31,9 +31,7 @@ function qry(low:int, hgh:int);
s1:= algebra.subselect(b,x,low,hgh,true,true,false);
end qry;
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
