Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16619
Modified Files:
Tag: Nov2009
sql.mx sql_optimizer.mx
Log Message:
Use the optimizer='off' instead of 'none'.
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.230.2.2
retrieving revision 1.230.2.3
diff -u -d -r1.230.2.2 -r1.230.2.3
--- sql_optimizer.mx 23 Oct 2009 11:54:23 -0000 1.230.2.2
+++ sql_optimizer.mx 23 Oct 2009 19:22:30 -0000 1.230.2.3
@@ -440,7 +440,7 @@
the SQL set optimizer statement. The default list has been
tested extensively and should provide overall good performance.
Additional pipelines are defined in the monetdb.conf file.
-The plan 'none' sets the optimizer pipeline to the minimal possible.
+The plan 'off' sets the optimizer pipeline to the minimal possible.
@c
str minimalPlan= "inline,remap,deadcode,multiplex";
str defaultPlan = NULL;
@@ -508,11 +508,11 @@
setOptimizers(str optimizer)
{
/* the optimizer control is a semicolon separated list of names */
- /* the predefined 'none' injects the default minimal plan upon need */
+ /* the predefined 'off' injects the default minimal plan upon need */
int top=0,i;
char *base, *nxt, *nme, *pipe;
- if (strcmp(optimizer,"none")==0)
+ if (optimizer == NULL || *optimizer == 0 || strcmp(optimizer,"off")==0)
optimizer= GDKstrdup(minimalPlan);
if (optimizerpipe == optimizer )
return optimizerpipe;
@@ -543,15 +543,15 @@
}
if (top == 1 && pipe == NULL){
showException(SQL,"optimizer","Optimizer %s does not exist, use
minimal one\n",optimizers[0]);
- setOptimizers("none");
+ setOptimizers("off");
}else
if (top == 256){
showException(SQL,"optimizer","Too many optimizer steps, use
minimal one\n");
- setOptimizers("none");
+ setOptimizers("off");
} else
if (SQLvalidatePipeline() ) {
showException(SQL,"optimizer"," Pipeline reset to
'%s'",optimizerpipe);
- setOptimizers("none");
+ setOptimizers("off");
}
return optimizerpipe;
}
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.358.2.4
retrieving revision 1.358.2.5
diff -u -d -r1.358.2.4 -r1.358.2.5
--- sql.mx 23 Oct 2009 12:15:44 -0000 1.358.2.4
+++ sql.mx 23 Oct 2009 19:22:30 -0000 1.358.2.5
@@ -3319,7 +3319,7 @@
o = (@1*) Tloc(bn,BUNfirst(bn));
p = (@2*) Tloc(b, BUNfirst(b));
q = (@2*) Tloc(b, BUNlast(b));
- bn->T->nonil= TRUE;
+ bn->T->nonil= b->T->nonil;
if ( b->T->nonil){
for (; p<q; p++)
*o = (@1) ((*p + (*p<0)?-5:5) / scales[scale]);
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
