Changeset: 2a358751a4b6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a358751a4b6
Modified Files:
MonetDB5/src/modules/mal/Tests/inspect05.stable.out
MonetDB5/src/optimizer/Tests/All
MonetDB5/src/optimizer/Tests/cst00.stable.out
MonetDB5/src/optimizer/Tests/cst01.stable.out
MonetDB5/src/optimizer/Tests/cst02.mal
MonetDB5/src/optimizer/Tests/cst02.stable.err
MonetDB5/src/optimizer/Tests/cst02.stable.out
MonetDB5/src/optimizer/opt_evaluate.mx
MonetDB5/src/optimizer/opt_octopus.mx
MonetDB5/src/optimizer/opt_support.mx
Branch: default
Log Message:
opt_evaluate: freeze the type of the value derived for constant expressions
opt_support: provide a function to see if later in the pipeline there is a
specific optimizer mentioned
opt_octopus: use the legibility test
diffs (truncated from 308 to 300 lines):
diff -r 42033c61ea66 -r 2a358751a4b6
MonetDB5/src/modules/mal/Tests/inspect05.stable.out
--- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Tue Jun 15
13:48:15 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Tue Jun 15
13:57:26 2010 +0200
@@ -1064,6 +1064,7 @@
[ "exportHead", "pattern", "sql",
"(s:streams,res_id:int):void ",
"mvc_export_head_wrap;"
]
[ "eval", "pattern", "sql",
"(cmd:str,output:bit):void ",
"SQLstatement;"
]
[ "eval", "pattern", "sql",
"(cmd:str):void ",
"SQLstatement;"
]
+[ "fitsView", "pattern", "sql",
"(fname:str):void ",
"fits_view;"
]
[ "forgetPrevious", "pattern", "sql",
"():void ",
"OPTforgetPrevious;"
]
[ "gzexpand", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLexpand;"
]
[ "gztruncate", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLtruncate;"
]
@@ -1118,18 +1119,19 @@
[ "vacuum", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLvacuum;"
]
[ "zero_or_one", "function", "sql",
"(b:bat[:oid,:any_1],gp:bat[:oid,:oid],gpe:bat[:oid,:oid]):bat[:oid,:any_1];",
"nil"
]
[ "zero_or_one", "command", "sql",
"(col:bat[:any_2,:any_1]):any_1 ",
"zero_or_one;"
]
-[ "bind_idxbat", "function", "octopus",
"(conn:str,mvc:ptr,sch:str,tab:str,index:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
-[ "bind_idxbat", "function", "octopus",
"(mvc:ptr,sch:str,tab:str,index:str,access:int,version:int):bat[:oid,:any_1];",
"nil"
]
-[ "bind_dbat", "function", "octopus",
"(conn:str,mvc:ptr,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
-[ "bind_dbat", "function", "octopus",
"(mvc:ptr,sch:str,tab:str,access:int,version:int):bat[:oid,:any_1];",
"nil"
]
-[ "bind", "function", "octopus",
"(conn:str,mvc:ptr,sch:str,tab:str,col:str,kind:int,version:int):bat[:oid,:any_1];",
"nil"
]
-[ "bind", "function", "octopus",
"(conn:str,mvc:ptr,sch:str,tab:str,col:str,kind:int,low:oid,hgh:oid,version:int):bat[:oid,:any_1];",
"nil"
]
+[ "bind_idxbat", "function", "octopus",
"(conn:str,sch:str,tab:str,index:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
+[ "bind_idxbat", "function", "octopus",
"(mvc:ptr,sch:str,tab:str,index:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
+[ "bind_dbat", "function", "octopus",
"(conn:str,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
+[ "bind_dbat", "function", "octopus",
"(mvc:ptr,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
+[ "bind", "function", "octopus",
"(conn:str,sch:str,tab:str,col:str,kind:int,version:int):bat[:oid,:any_1];",
"nil"
]
+[ "bind", "function", "octopus",
"(conn:str,sch:str,tab:str,col:str,kind:int,low:oid,hgh:oid,version:int):bat[:oid,:any_1];",
"nil"
]
[ "bind", "function", "octopus",
"(mvc:ptr,sch:str,tab:str,col:str,kind:int,version:int):bat[:oid,:any_1];",
"nil"
]
[ "bind", "function", "octopus",
"(mvc:ptr,sch:str,tab:str,col:str,kind:int,low:oid,hgh:oid,version:int):bat[:oid,:any_1];",
"nil"
]
+[ "connect", "command", "octopus",
"(dbname:str):str ",
"OCTOPUSconnect;"
]
[ "getBid", "function", "octopus",
"(dbname:str,fn:str,bidtype:sht):lng;",
"nil"
]
[ "getVariable", "function", "octopus",
"(conn:str,name:str):any_1;",
"nil"
]
[ "legAdvice", "pattern", "octopus",
"(mod:str,fcn:str):int ",
"OPTlegAdvice;"
]
-[ "register", "function", "octopus",
"(dbname:str,fn:str):void;",
"nil"
]
+[ "register", "pattern", "octopus",
"(dbname:str,fname:str):void ",
"OCTOPUSregister;"
]
[ "bind", "command", "dictionary",
"(nme:str) (idx:bat[:oid,:any_1],val:bat[:any_1,:any_2]) ",
"DICTbind;"
]
[ "compress", "pattern", "dictionary",
"(s:str,b:bat[:any_1,:any_2]):void ",
"DICTcompress;"
]
[ "decompress", "command", "dictionary",
"(nme:str):void ",
"DICTdecompress;"
]
diff -r 42033c61ea66 -r 2a358751a4b6 MonetDB5/src/optimizer/Tests/All
--- a/MonetDB5/src/optimizer/Tests/All Tue Jun 15 13:48:15 2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/All Tue Jun 15 13:57:26 2010 +0200
@@ -30,6 +30,7 @@
cst00
cst01
+cst02
remap
inlineFunction
diff -r 42033c61ea66 -r 2a358751a4b6
MonetDB5/src/optimizer/Tests/cst00.stable.out
--- a/MonetDB5/src/optimizer/Tests/cst00.stable.out Tue Jun 15 13:48:15
2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/cst00.stable.out Tue Jun 15 13:57:26
2010 +0200
@@ -30,16 +30,16 @@
mdb.List("user","tst");
end main;
function user.tst():void; # 0 tst:void := user.tst()
- a := 2; # 1 a:int := _5:int
- io.print(2); # 2 _3:void := IOprint_val(_5:int)
- b := 2; # 3 b:int := _5:int
- io.print(2); # 4 _6:void := IOprint_val(_5:int)
- c := 6; # 5 c:int := _14:int
- io.print(6); # 6 _9:void := IOprint_val(_14:int)
- d := 6; # 7 d:flt := _15:flt
- io.print(6); # 8 _11:void := IOprint_val(_15:flt)
- e := -0.279415488; # 9 e:flt := _16:flt
- io.print(-0.279415488); # 10 _13:void := IOprint_val(_16:flt)
+ a := 2:int; # 1 a:int := _5:int
+ io.print(2:int); # 2 _3:void := IOprint_val(_5:int)
+ b := 2:int; # 3 b:int := _5:int
+ io.print(2:int); # 4 _6:void := IOprint_val(_5:int)
+ c := 6:int; # 5 c:int := _14:int
+ io.print(6:int); # 6 _9:void := IOprint_val(_14:int)
+ d := 6:flt; # 7 d:flt := _15:flt
+ io.print(6:flt); # 8 _11:void := IOprint_val(_15:flt)
+ e := -0.279415488:flt; # 9 e:flt := _16:flt
+ io.print(-0.279415488:flt); # 10 _13:void := IOprint_val(_16:flt)
end tst; # 11
# 08:40:57 >
diff -r 42033c61ea66 -r 2a358751a4b6
MonetDB5/src/optimizer/Tests/cst01.stable.out
--- a/MonetDB5/src/optimizer/Tests/cst01.stable.out Tue Jun 15 13:48:15
2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/cst01.stable.out Tue Jun 15 13:57:26
2010 +0200
@@ -14,7 +14,7 @@
function user.main():void;
# test constant expressions
X16 := mmath.pi();
- X17 := calc./(180,X16);
+ X17 := calc./(180:dbl,X16);
io.print(X17);
mdb.List();
end main;
@@ -22,7 +22,7 @@
function user.main():void; # 0 main:void := user.main() {G}
# test constant expressions
X16 := mmath.pi(); # 2 X16:dbl := MATHpi()
- X17 := calc./(180,X16); # 3 X17:dbl :=
CALCbinarycheckDIVdbldbl(_14:dbl, X16:dbl)
+ X17 := calc./(180:dbl,X16); # 3 X17:dbl :=
CALCbinarycheckDIVdbldbl(_14:dbl, X16:dbl)
io.print(X17); # 4 _9:void := IOprint_val(X17:dbl)
mdb.List(); # 5 _12:void := MDBlistDetail()
end main; # 6
diff -r 42033c61ea66 -r 2a358751a4b6 MonetDB5/src/optimizer/Tests/cst02.mal
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/src/optimizer/Tests/cst02.mal Tue Jun 15 13:57:26 2010 +0200
@@ -0,0 +1,7 @@
+# test constant expressions with strong types
+ X2 := calc.dbl(nil);
+ X14 := X2 + 0.0;
+ io.print(X14);
+
+optimizer.evaluate();
+mdb.List();
diff -r 42033c61ea66 -r 2a358751a4b6
MonetDB5/src/optimizer/Tests/cst02.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/src/optimizer/Tests/cst02.stable.err Tue Jun 15 13:57:26
2010 +0200
@@ -0,0 +1,72 @@
+stderr of test 'cst02` in directory 'src/optimizer` itself:
+
+
+# 13:54:00 >
+# 13:54:00 > mserver5 "--config=/ufs/mk/current//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=35032 --set xrpc_port=47587
--set monet_prompt= --set mal_listing=2 --trace --dbname=mTests_src_optimizer
cst02.mal
+# 13:54:00 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.39.0
+# builtin opt prefix = /ufs/mk/current//Linux
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# 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
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/mk/current//Linux
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/mk/current//Linux
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt compression_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
+# cmdline opt config = /ufs/mk/current//Linux/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin
+# cmdline opt gdk_dbfarm = /ufs/mk/current//Linux/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 35032
+# cmdline opt xrpc_port = 47587
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_src_optimizer
+#warning: please don't forget to set your vault key!
+#(see /ufs/mk/current//Linux/etc/monetdb5.conf)
+
+# 13:54:00 >
+# 13:54:00 > Done.
+# 13:54:00 >
+
diff -r 42033c61ea66 -r 2a358751a4b6
MonetDB5/src/optimizer/Tests/cst02.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/src/optimizer/Tests/cst02.stable.out Tue Jun 15 13:57:26
2010 +0200
@@ -0,0 +1,37 @@
+stdout of test 'cst02` in directory 'src/optimizer` itself:
+
+
+# 13:54:00 >
+# 13:54:00 > mserver5 "--config=/ufs/mk/current//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=35032 --set xrpc_port=47587
--set monet_prompt= --set mal_listing=2 --trace --dbname=mTests_src_optimizer
cst02.mal
+# 13:54:00 >
+
+# MonetDB server v5.21.0, based on kernel v1.39.0
+# Serving database 'mTests_src_optimizer', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.751 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2010 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:35032/
+# MonetDB/SQL module v2.39.0 loaded
+# MonetDB/GIS module v0.19.0 loaded
+function user.main():void;
+# test constant expressions with strong types
+ X2 := nil:dbl;
+ X14 := nil:dbl;
+ io.print(nil:dbl);
+ mdb.List();
+end main;
+[ nil ]
+function user.main():void; # 0 main:void := user.main() {G}
+# test constant expressions with strong types
+ X2 := nil:dbl; # 2 X2:dbl := _9:dbl
+ X14 := nil:dbl; # 3 X14:dbl := _9:dbl
+ io.print(nil:dbl); # 4 _6:void := IOprint_val(_9:dbl)
+ mdb.List(); # 5 _8:void := MDBlistDetail()
+end main; # 6
+
+# 13:54:00 >
+# 13:54:00 > Done.
+# 13:54:00 >
+
diff -r 42033c61ea66 -r 2a358751a4b6 MonetDB5/src/optimizer/opt_evaluate.mx
--- a/MonetDB5/src/optimizer/opt_evaluate.mx Tue Jun 15 13:48:15 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_evaluate.mx Tue Jun 15 13:57:26 2010 +0200
@@ -212,6 +212,9 @@
p->argc = 2;
p->token = ASSIGNsymbol;
clrFunction(p);
+ /* freeze the type */
+ setVarFixed(mb,getArg(p,1));
+ setVarUDFtype(mb,getArg(p,1));
#ifdef DEBUG_OPT_CX
stream_printf(cntxt->fdout, "Evaluated new
constant=%d -> %d:%s\n",
getArg(p, 0), getArg(p, 1),
getTypeName(getArgType(mb, p, 1)));
diff -r 42033c61ea66 -r 2a358751a4b6 MonetDB5/src/optimizer/opt_octopus.mx
--- a/MonetDB5/src/optimizer/opt_octopus.mx Tue Jun 15 13:48:15 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_octopus.mx Tue Jun 15 13:57:26 2010 +0200
@@ -832,19 +832,22 @@
@:wrapOptimizer(octopus,OPT_CHECK_ALL)@
@-
The remainder contains the octopus support routines.
-The legAdvice function has to negotiate with merovingian to
+The legAdviceInternal function has to negotiate with merovingian to
determine the number of legs to use for a specific query plan.
This may involve the size and structure of the database tables
accessed as well.
+Furthermore, the advice should only be given when the octopus
+optimizer is enabled.
@c
int
OPTlegAdviceInternal(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- (void) mb;
(void) stk;
(void) pci;
- return GDKnr_threads;
+ if ( isOptimizerEnabled(mb,octopusRef) )
+ return GDKnr_threads;
+ return 0;
}
str
diff -r 42033c61ea66 -r 2a358751a4b6 MonetDB5/src/optimizer/opt_support.mx
--- a/MonetDB5/src/optimizer/opt_support.mx Tue Jun 15 13:48:15 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_support.mx Tue Jun 15 13:57:26 2010 +0200
@@ -538,6 +538,7 @@
opt_export int isMapOp(InstrPtr q);
opt_export int isDiffOp(InstrPtr q);
opt_export int allTargetsVisible(MalBlkPtr mb, Lifespan span, int pc,int qc);
+opt_export int isOptimizerEnabled(MalBlkPtr mb, str opt);
@}
@-
@node Framework, Lifespan Analysis, Building Blocks, The MAL Optimizer
@@ -1314,6 +1315,26 @@
getFunctionId(p)== likeselectRef ||
getFunctionId(p)== likeuselectRef ));
}
+...@-
+Some optimizers are interdependent (e.g. mitosis and octopus), which
+requires inspection of the pipeline attached to a MAL block.
+...@c
+int
+isOptimizerEnabled(MalBlkPtr mb, str opt)
+{
+ int i;
+ InstrPtr q;
+
+ for (i= mb->stop-1; i > 0; i--){
+ q= getInstrPtr(mb,i);
+ if ( q->token == ENDsymbol)
+ break;
+ if ( getModuleId(q) == optimizerRef &&
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
