Changeset: e15567ede0eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e15567ede0eb
Modified Files:
monetdb5/modules/mal/recycle.c
monetdb5/modules/mal/recycle.h
monetdb5/modules/mal/recycle.mal
Branch: default
Log Message:
Remove superflous MAL instructions.
diffs (96 lines):
diff --git a/monetdb5/modules/mal/recycle.c b/monetdb5/modules/mal/recycle.c
--- a/monetdb5/modules/mal/recycle.c
+++ b/monetdb5/modules/mal/recycle.c
@@ -66,39 +66,14 @@ RECYCLEsetCache(Client cntxt, MalBlkPtr
* At the end of the session we have to cleanup the recycle cache.
*/
str
-RECYCLEshutdownWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p){
+RECYCLEdropWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p){
(void) mb;
(void) stk;
(void) p;
- RECYCLEshutdown(cntxt);
+ RECYCLEdrop(cntxt);
return MAL_SUCCEED;
}
-str
-RECYCLEmonitor(int *ret, int *p)
-{
- (void) ret;
- monitorRecycler = *p;
- return MAL_SUCCEED;
-}
-
-
-str
-RECYCLEstartWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
-{
- (void) stk;
- (void) p;
- (void) mb;
- return RECYCLEstart(cntxt);
-}
-
-str
-RECYCLEstopWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p){
- (void) stk;
- (void) p;
- (void) mb;
- return RECYCLEstop(cntxt);
-}
str RECYCLEappendSQL(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
diff --git a/monetdb5/modules/mal/recycle.h b/monetdb5/modules/mal/recycle.h
--- a/monetdb5/modules/mal/recycle.h
+++ b/monetdb5/modules/mal/recycle.h
@@ -36,11 +36,7 @@
recycle_export str RECYCLEdumpWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
recycle_export str RECYCLEsetCache(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
-recycle_export str RECYCLEshutdownWrap(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr p);
-recycle_export str RECYCLEmonitor(int *d, int *p);
-recycle_export str RECYCLEstartWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
-recycle_export str RECYCLEstopWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
-recycle_export str RECYCLEdumpQPatWrap(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
+recycle_export str RECYCLEdropWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
// SQL updates should trigger recycler cleanup operations
recycle_export str RECYCLEresetBATwrap(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr p);
diff --git a/monetdb5/modules/mal/recycle.mal b/monetdb5/modules/mal/recycle.mal
--- a/monetdb5/modules/mal/recycle.mal
+++ b/monetdb5/modules/mal/recycle.mal
@@ -17,14 +17,6 @@
module recycle;
-pattern start():void
-address RECYCLEstart
-comment "Initialize recycler for the current block";
-
-pattern stop():void
-address RECYCLEstop
-comment "Cleans recycler bookkeeping";
-
pattern dump():void
address RECYCLEdumpWrap
comment "Dump summary of recycle table";
@@ -45,13 +37,9 @@ pattern delete(delta:int,sname:str,tbl:s
address RECYCLEdeleteSQL
comment "Correct recycle pool for SQL delete statement";
-pattern shutdown():void
-address RECYCLEshutdownWrap
-comment "Clear the recycle cache";
-
-command monitor(f:int):void
-address RECYCLEmonitor
-comment "start/stop the monitoring (printing) of the recycler info (storage
size used and number of statements admitted)";
+pattern drop():void
+address RECYCLEdropWrap
+comment "Remove the recycle cache";
pattern prologue():void
address RECYCLEprologueWrap
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
