Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15760/src/backends/monet5
Modified Files:
sql_gencode.mx sql_optimizer.mx
Log Message:
add property "inline" to generated mal block for sql functions
Add 'commented out' inliners optimizer to optimzers list.
(commented out as the current inliner code isn't up to the task jet)
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- sql_gencode.mx 20 Feb 2007 11:50:46 -0000 1.233
+++ sql_gencode.mx 19 Mar 2007 08:31:25 -0000 1.234
@@ -2012,6 +2012,7 @@
Client c = be->client;
Symbol backup = NULL;
stmt *s;
+ bit t = TRUE;
/* nothing to do for internal and ready functions */
if (!f->sql || f->sql > 1)
@@ -2033,6 +2034,10 @@
curBlk = c->curprg->def;
curInstr = getInstrPtr(curBlk, 0);
+ if (curBlk->var[0]->props == 0)
+ curBlk->var[0]->props = newPropertySet();
+ setProperty(getProps(curBlk,0),"inline", "=", TYPE_bit, &t);
+
if (f->res.type) {
setVarType(curBlk, 0, f->res.type->localtype);
freezeVarType(curBlk,0);
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- sql_optimizer.mx 17 Jan 2007 13:38:11 -0000 1.140
+++ sql_optimizer.mx 19 Mar 2007 08:31:25 -0000 1.141
@@ -368,9 +368,10 @@
tested extensively and should provide overall good performance.
@c
str defaultPlan=
+ /*"inliners," */
"costModel,"
"coercions,"
- /* "emptySet," */
+ /*"emptySet," */
/* "joinselect," */
"accessmode,"
"aliases,"
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
