Changeset: 9f14c0565db1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f14c0565db1
Removed Files:
monetdb5/mal/Tests/recycle06.mal
monetdb5/mal/Tests/recycle06.stable.err
monetdb5/mal/Tests/recycle06.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/recycle00.stable.out
monetdb5/mal/Tests/recycle01.stable.out
monetdb5/mal/Tests/recycle02.stable.out
monetdb5/mal/Tests/recycle03.stable.out
monetdb5/mal/Tests/recycle04.stable.out
monetdb5/mal/Tests/recycle05.mal
monetdb5/mal/Tests/recycle07.mal
monetdb5/mal/Tests/recycle07.stable.out
monetdb5/mal/Tests/recycle11.mal
monetdb5/mal/Tests/recycle11.stable.out
monetdb5/mal/Tests/recycle12.stable.out
monetdb5/optimizer/opt_recycler.c
Branch: default
Log Message:
Approve minor changes
diffs (truncated from 756 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
@@ -236,12 +236,11 @@ recycle02
recycle03
recycle04
recycle05
-recycle06
recycle07
recycle08
recycle10
-#recycle11
-#recycle12
+recycle11
+recycle12
venks
saveload
diff --git a/monetdb5/mal/Tests/recycle00.stable.out
b/monetdb5/mal/Tests/recycle00.stable.out
--- a/monetdb5/mal/Tests/recycle00.stable.out
+++ b/monetdb5/mal/Tests/recycle00.stable.out
@@ -46,12 +46,10 @@ function user.main():void;
recycle.dump();
end main;
function user.qry():void; # 0 qry:void := user.qry()
- recycle.start(); # 1 _5:void := RECYCLEstart()
- i := 23; # 2 i:int := _2:int {R}
- j := calc.*(i,i); # 3 j:int := CMDvarMULsignal(i:int,
i:int) {R}
- io.print(j); # 4 _4:void := IOprint_val(j:int)
- recycle.stop(); # 5 _6:void := RECYCLEstop()
-end qry; # 6
+ i := 23; # 1 i:int := _2:int
+ j := calc.*(i,i); # 2 j:int := CMDvarMULsignal(i:int,
i:int)
+ io.print(j); # 3 _4:void := IOprint_val(j:int)
+end qry; # 4
[ "start" ]
[ 529 ]
[ "next" ]
diff --git a/monetdb5/mal/Tests/recycle01.stable.out
b/monetdb5/mal/Tests/recycle01.stable.out
--- a/monetdb5/mal/Tests/recycle01.stable.out
+++ b/monetdb5/mal/Tests/recycle01.stable.out
@@ -76,13 +76,11 @@ function user.main():void;
recycle.dump();
end main;
function sql.qry(low:int,hgh:int):void;
- recycle.start();
m := sql.mvc();
x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0);
s := algebra.subselect(b,x,low,hgh,true,true,false);
io.print(s);
- recycle.stop();
end qry;
[ "start" ]
#RECYCLE [ 0] X_0 := sql.mvc();
diff --git a/monetdb5/mal/Tests/recycle02.stable.out
b/monetdb5/mal/Tests/recycle02.stable.out
--- a/monetdb5/mal/Tests/recycle02.stable.out
+++ b/monetdb5/mal/Tests/recycle02.stable.out
@@ -80,13 +80,11 @@ function user.main():void;
recycle.dump();
end main;
function sql.qry(low:int,hgh:int):void;
- recycle.start();
m := sql.mvc();
x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0);
s := algebra.subselect(b,x,low,hgh,true,true,false);
io.print(s);
- recycle.stop();
end qry;
[ "start" ]
#RECYCLE [ 0] X_0 := sql.mvc();
diff --git a/monetdb5/mal/Tests/recycle03.stable.out
b/monetdb5/mal/Tests/recycle03.stable.out
--- a/monetdb5/mal/Tests/recycle03.stable.out
+++ b/monetdb5/mal/Tests/recycle03.stable.out
@@ -81,14 +81,12 @@ function user.main():void;
recycle.dump();
end main;
function sql.qry(low:int,hgh:int):void;
- recycle.start();
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);
j := algebra.join(s1,b);
io.print(j);
- recycle.stop();
end qry;
[ "start" ]
#-----------------#
diff --git a/monetdb5/mal/Tests/recycle04.stable.out
b/monetdb5/mal/Tests/recycle04.stable.out
--- a/monetdb5/mal/Tests/recycle04.stable.out
+++ b/monetdb5/mal/Tests/recycle04.stable.out
@@ -74,14 +74,12 @@ function user.main():void;
recycle.dump();
end main;
function sql.qry(low:int,hgh:int):void;
- recycle.start();
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);
j := algebra.join(s1,b);
io.print(j);
- recycle.stop();
end qry;
[ "start" ]
#RECYCLE [ 0] X_0 := sql.mvc();
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
@@ -1,4 +1,4 @@
-# Test of LRU cache policy in limited memory (12 RU)
+# Test of LRU cache policy in limited cache size
module sql;
function sql.mvc():int;
return mvc:=1;
diff --git a/monetdb5/mal/Tests/recycle06.mal b/monetdb5/mal/Tests/recycle06.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle06.mal
+++ /dev/null
@@ -1,41 +0,0 @@
-# Test of LRU cache policy in limited cache (10 lines, 1 is always taken by
fake 0)
-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,1000: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);
-barrier i:= 0:int;
- bat.append(b,i);
- redo i:= iterator.next(1:int,1000:int);
-exit i;
-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);
-end qry;
-
-recycle.setCache(4);
-optimizer.recycler("user","qry");
-
-io.print("start");
-qry(100,120);
-qry(700,710);
-recycle.dump();
-# The next query should evict the oldest leaf (CL #3 reverse)
-qry(400,700);
-recycle.dump();
diff --git a/monetdb5/mal/Tests/recycle06.stable.err
b/monetdb5/mal/Tests/recycle06.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle06.stable.err
+++ /dev/null
@@ -1,80 +0,0 @@
-stderr of test 'recycle06` in directory 'monetdb5/mal` itself:
-
-
-# 15:54:58 >
-# 15:54:58 > mserver5
"--config=/export/scratch1/milena/monet.DBG/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/export/scratch1/milena/monet.DBG/lib/MonetDB5:/export/scratch1/milena/monet.DBG/lib/MonetDB5/lib:/export/scratch1/milena/monet.DBG/lib/MonetDB5/bin"
--set "gdk_dbfarm=/export/scratch1/milena/monet.DBG/var/MonetDB5/dbfarm" --set
"sql_logdir=/export/scratch1/milena/monet.DBG/var/MonetDB5/sql_logs" --set
mapi_open=true --set xrpc_open=true --set mapi_port=34583 --set xrpc_port=49067
--set monet_prompt= --trace --dbname=mTests_src_mal recycle06.mal
-# 15:54:58 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.25.0
-# builtin opt monet_pid = 18934
-# builtin opt prefix = /export/scratch1/milena/monet.DBG
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path =
${exec_prefix}/lib/MonetDB:${exec_prefix}/lib/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB/sql_logs
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB/xquery_logs
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /export/scratch1/milena/monet.DBG
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /export/scratch1/milena/monet.DBG
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 15
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_debug = 0
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${exec_prefix}/lib/MonetDB5/sql_init.sql
-# cmdline opt config = /export/scratch1/milena/monet.DBG/etc/monetdb5.conf
-# cmdline opt monet_mod_path =
/export/scratch1/milena/monet.DBG/lib/MonetDB5:/export/scratch1/milena/monet.DBG/lib/MonetDB5/lib:/export/scratch1/milena/monet.DBG/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/export/scratch1/milena/monet.DBG/var/MonetDB5/dbfarm
-# cmdline opt sql_logdir =
/export/scratch1/milena/monet.DBG/var/MonetDB5/sql_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 34583
-# cmdline opt xrpc_port = 49067
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_mal
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see /export/scratch1/milena/monet.DBG/etc/monetdb5.conf)
-
-# 15:54:58 >
-# 15:54:58 > Done.
-# 15:54:58 >
-
diff --git a/monetdb5/mal/Tests/recycle06.stable.out
b/monetdb5/mal/Tests/recycle06.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle06.stable.out
+++ /dev/null
@@ -1,107 +0,0 @@
-stdout of test 'recycle06` in directory 'monetdb5/mal` itself:
-
-
-# 15:54:58 >
-# 15:54:58 > mserver5
"--config=/export/scratch1/milena/monet.DBG/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/export/scratch1/milena/monet.DBG/lib/MonetDB5:/export/scratch1/milena/monet.DBG/lib/MonetDB5/lib:/export/scratch1/milena/monet.DBG/lib/MonetDB5/bin"
--set "gdk_dbfarm=/export/scratch1/milena/monet.DBG/var/MonetDB5/dbfarm" --set
"sql_logdir=/export/scratch1/milena/monet.DBG/var/MonetDB5/sql_logs" --set
mapi_open=true --set xrpc_open=true --set mapi_port=34583 --set xrpc_port=49067
--set monet_prompt= --trace --dbname=mTests_src_mal recycle06.mal
-# 15:54:58 >
-
-# 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
-# Found 15.591 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:30041/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21946/.s.monetdb.30041
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-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@0:oid;
- bat.append(b,i);
- redo i := iterator.next(1@0:oid,1000@0: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);
-barrier i := 0:int;
- bat.append(b,i);
- redo i := iterator.next(1:int,1000:int);
-exit i;
- return bind := b;
-end bind;
-function sql.qry(low:int,hgh:int):void;
- 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);
-end qry;
-#
-#recycle.setRetainPolicy(1);
-#recycle.setReusePolicy(1);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
