Changeset: 444799f5e9e2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=444799f5e9e2
Removed Files:
monetdb5/mal/Tests/recycle00.malC
monetdb5/mal/Tests/recycle00.stable.err
monetdb5/mal/Tests/recycle00.stable.out
monetdb5/mal/Tests/recycle01.malC
monetdb5/mal/Tests/recycle01.stable.err
monetdb5/mal/Tests/recycle01.stable.out
monetdb5/mal/Tests/recycle02.malC
monetdb5/mal/Tests/recycle02.stable.err
monetdb5/mal/Tests/recycle02.stable.out
monetdb5/mal/Tests/recycle03.malC
monetdb5/mal/Tests/recycle03.stable.err
monetdb5/mal/Tests/recycle03.stable.out
monetdb5/mal/Tests/recycle04.malC
monetdb5/mal/Tests/recycle04.stable.err
monetdb5/mal/Tests/recycle04.stable.out
monetdb5/mal/Tests/recycle05.malC
monetdb5/mal/Tests/recycle05.stable.err
monetdb5/mal/Tests/recycle05.stable.out
monetdb5/mal/Tests/recycle07.malC
monetdb5/mal/Tests/recycle07.stable.err
monetdb5/mal/Tests/recycle07.stable.out
monetdb5/mal/Tests/recycle08.malC
monetdb5/mal/Tests/recycle08.stable.err
monetdb5/mal/Tests/recycle08.stable.out
monetdb5/mal/Tests/recycle10.malC
monetdb5/mal/Tests/recycle10.stable.err
monetdb5/mal/Tests/recycle10.stable.out
monetdb5/mal/Tests/recycle11.malC
monetdb5/mal/Tests/recycle11.stable.err
monetdb5/mal/Tests/recycle11.stable.out
monetdb5/mal/Tests/recycle12.malC
monetdb5/mal/Tests/recycle12.stable.err
monetdb5/mal/Tests/recycle12.stable.out
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
monetdb5/optimizer/opt_recycler.c
monetdb5/optimizer/opt_recycler.h
sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql
sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.stable.err
sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.stable.out
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/Makefile.ag
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst013.stable.err
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
monetdb5/mal/mal_runtime.c
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/mal_init.mal
monetdb5/modules/mal/mdb.c
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_wrapper.c
sql/ChangeLog
sql/backends/monet5/sql.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_user.c
sql/test/BugTracker-2009/Tests/All
tools/mserver/mserver5.c
Branch: default
Log Message:
Recycler code is moved to the attic
There is little interest and we don't have automated testing
at the SQL level. It will rest in the attic until use cases
appear.
diffs (truncated from 5272 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1568,7 +1568,6 @@ int OPTprofilerImplementation(Client cnt
int OPTprojectionpathImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTpushselectImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTquerylogImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-int OPTrecyclerImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTreduceImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTremapImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
int OPTremoteQueriesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
@@ -1621,19 +1620,6 @@ str QOTshowPlan(Client cntxt, MalBlkPtr
void QOTstatisticsExit(void);
void QOTupdateStatistics(str nme, int prop, lng val);
QueryQueue QRYqueue;
-str RECYCLEappendSQL(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str RECYCLEcolumn(Client cntxt, str sch, str tbl, str col);
-str RECYCLEdeleteSQL(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-void RECYCLEdrop(Client cntxt);
-str RECYCLEdropWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-void RECYCLEdump(stream *s);
-str RECYCLEdumpWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-lng RECYCLEentry(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p,
RuntimeProfile prof);
-void RECYCLEexit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p,
RuntimeProfile prof);
-void RECYCLEinit(void);
-str RECYCLEresetBAT(Client cntxt, int bid);
-str RECYCLEresetBATwrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str RECYCLEsetCache(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str RMTbatload(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str RMTbincopyfrom(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str RMTbincopyto(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -2409,9 +2395,6 @@ str rapiRef;
int readConsole(Client cntxt);
MalStkPtr reallocGlobalStack(MalStkPtr s, int cnt);
str reconnectRef;
-MalBlkPtr recycleBlk;
-int recycleCacheLimit;
-str recycleRef;
str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr
stk);
str refineRef;
str registerRef;
diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -39,7 +39,6 @@ lib_mal = {
mal_parser.c mal_parser.h \
mal_profiler.c mal_profiler.h \
mal_readline.c mal_readline.h \
- mal_recycle.c mal_recycle.h \
mal_resolve.c mal_resolve.h \
mal_sabaoth.c mal_sabaoth.h \
mal_scenario.c mal_scenario.h \
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -190,18 +190,6 @@ tst920
tst901a
#tst901b
-recycle00
-recycle01
-recycle02
-recycle03
-recycle04
-recycle05
-recycle07
-recycle08
-recycle10
-recycle11
-recycle12
-
parseErrors
dataflow01
diff --git a/monetdb5/mal/Tests/recycle00.malC
b/monetdb5/mal/Tests/recycle00.malC
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle00.malC
+++ /dev/null
@@ -1,18 +0,0 @@
-#test the basics of the replicator
-
-function qry();
- i:=23;
- j:=i*i;
- io.print(j);
-end qry;
-
-optimizer.recycler("user","qry");
-mdb.list("user","qry");
-mdb.List("user","qry");
-io.print("start");
-qry();
-io.print("next");
-qry();
-io.print("last");
-qry();
-recycle.dump();
diff --git a/monetdb5/mal/Tests/recycle00.stable.err
b/monetdb5/mal/Tests/recycle00.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle00.stable.err
+++ /dev/null
@@ -1,14 +0,0 @@
-stderr of test 'recycle00` in directory 'monetdb5/mal` itself:
-
-
-# 12:49:06 >
-# 12:49:06 > 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=33469 --set xrpc_port=48324 --set
monet_prompt= --trace --dbname=mTests_src_mal recycle00.mal
-# 12:49:06 >
-
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
-
-# 12:49:06 >
-# 12:49:06 > Done.
-# 12:49:06 >
-
diff --git a/monetdb5/mal/Tests/recycle00.stable.out
b/monetdb5/mal/Tests/recycle00.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle00.stable.out
+++ /dev/null
@@ -1,59 +0,0 @@
-stdout of test 'recycle00` in directory 'monetdb5/mal` itself:
-
-
-# 12:49:06 >
-# 12:49:06 > 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=33469 --set xrpc_port=48324 --set
monet_prompt= --trace --dbname=mTests_src_mal recycle00.mal
-# 12:49:06 >
-
-# MonetDB 5 server v11.22.0
-# This is an unreleased version
-# Serving database 'mTests_monetdb5_mal', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 15.589 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:31235/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23223/.s.monetdb.31235
-# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.4'
-# Finished reading the write-ahead log 'sql_logs/sql/log.4'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
-
-# 20:53:43 >
-# 20:53:43 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23223" "--port=31235"
-# 20:53:43 >
-
-#mdb.list("user","qry");
-function user.qry():void;
- i := 23;
- j := calc.*(i,i);
- io.print(j);
-end user.qry;
-function user.qry():void; #[0] (0) 0
- i:int := 23:int; #[1] (0) 1 <- 2
- j:int := calc.*(i:int,i:int); #[2] (0) CMDvarMULsignal 3 <- 1
1
- io.print(j:int); #[3] (0) IOprint_val 4 <- 3
-end user.qry; #[4] (0)
-[ "start" ]
-[ 529 ]
-[ "next" ]
-[ 529 ]
-[ "last" ]
-[ 529 ]
-#Recycler catalog
-#retain= 1 time =0 sze= 0 alpha= 0.500
-#reuse= 2
-#rcache= 0
-# 0 lru= 0 cnt= 1 ticks= 17 vol= 0 _0 := 23;
-# 1 lru= 0 cnt= 1 ticks= 11 vol= 0 _1 := calc.*(23,23);
-
-# 12:49:06 >
-# 12:49:06 > Done.
-# 12:49:06 >
-
diff --git a/monetdb5/mal/Tests/recycle01.malC
b/monetdb5/mal/Tests/recycle01.malC
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle01.malC
+++ /dev/null
@@ -1,49 +0,0 @@
-#test the basics of the recycler
-#reusing select results
-
-module sql;
-function sql.mvc():int;
- return mvc:=1;
-end mvc;
-
-function sql.tid(mvc:int,s:str,t:str):bat[:oid];
-b:= bat.new(:oid);
-barrier i:= 0:oid;
- bat.append(b,i);
- redo i:= iterator.next(1:oid,12:oid);
-exit i;
- return tid:= b;
-end tid;
-
-function sql.bind(mvc:int, s:str,t:str,c:str,i:int):bat[:int];
- b:= bat.new(:int);
- bat.append(b,0);
- bat.append(b,1);
- bat.append(b,2);
- bat.append(b,3);
- bat.append(b,4);
- bat.append(b,5);
- bat.append(b,6);
- bat.append(b,7);
- bat.append(b,8);
- bat.append(b,9);
- bat.append(b,10);
- bat.append(b,11);
- return bind:=b;
-end bind;
-
-function qry(low:int, hgh:int);
- m:= sql.mvc();
- x:bat[:oid] := sql.tid(m,"sys","tbl");
- b:bat[:int]:= sql.bind(m,"sys","tbl","col",0);
- s:= algebra.subselect(b,x,low,hgh,true,true,false);
- io.print(s);
-end qry;
-
-optimizer.recycler("user","qry");
-mdb.list("user","qry");
-io.print("start");
-qry(1,10);
-io.print("reuse BAT");
-qry(1,10);
-recycle.dump();
diff --git a/monetdb5/mal/Tests/recycle01.stable.err
b/monetdb5/mal/Tests/recycle01.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle01.stable.err
+++ /dev/null
@@ -1,37 +0,0 @@
-stderr of test 'recycle01` in directory 'monetdb5/mal` itself:
-
-
-# 20:44:21 >
-# 20:44:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34866" "--set"
"mapi_usock=/var/tmp/mtest-23471/.s.monetdb.34866" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
-# 20:44:21 >
-
-# builtin opt gdk_dbpath =
/export/scratch1/mk/default//Linux/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 = 34866
-# cmdline opt mapi_usock = /var/tmp/mtest-23471/.s.monetdb.34866
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal
-# cmdline opt mal_listing = 2
-# cmdline opt embedded_r = yes
-# cmdline opt gdk_debug = 536870922
-
-# 20:44:21 >
-# 20:44:21 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-23471" "--port=34866"
-# 20:44:21 >
-
-
-# 20:44:22 >
-# 20:44:22 > "Done."
-# 20:44:22 >
-
diff --git a/monetdb5/mal/Tests/recycle01.stable.out
b/monetdb5/mal/Tests/recycle01.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/recycle01.stable.out
+++ /dev/null
@@ -1,94 +0,0 @@
-stdout of test 'recycle01` in directory 'monetdb5/mal` itself:
-
-
-# 20:44:21 >
-# 20:44:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34866" "--set"
"mapi_usock=/var/tmp/mtest-23471/.s.monetdb.34866" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
-# 20:44:21 >
-
-# MonetDB 5 server v11.22.0
-# This is an unreleased version
-# Serving database 'mTests_monetdb5_mal', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 15.589 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:34866/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23471/.s.monetdb.34866
-# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
