Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21043/src/backends/monet5
Modified Files:
sql_optimizer.mx
Log Message:
mitosis needs mergetable not the otherway around
U sql_optimizer.mx
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- sql_optimizer.mx 4 Jun 2009 22:24:15 -0000 1.223
+++ sql_optimizer.mx 5 Jun 2009 08:20:45 -0000 1.224
@@ -450,7 +450,7 @@
int
SQLvalidatePipeline(void){
int error= 0;
- int mitosis= FALSE, deadcode= FALSE;
+ int mitosis= FALSE, deadcode= FALSE, mergetable= FALSE;
int i;
if (optimizers[0] && strcmp(optimizers[0],"inline") ){
@@ -465,10 +465,9 @@
if (strcmp(optimizers[i],"mitosis") == 0)
mitosis= TRUE;
else
- if (strcmp(optimizers[i],"mergetable") == 0 && mitosis ==
FALSE) {
- showException(SQL,"optimizer"," 'mergetable' needs
'mitosis'\n");
- error++;
- }
+ if (strcmp(optimizers[i],"mergetable") == 0)
+ mergetable= TRUE;
+
#ifdef WIN32
else
if (strcmp(optimizers[i],"octopus") == 0){
@@ -476,6 +475,10 @@
error++;
}
#endif
+ if (mitosis == TRUE && mergetable == FALSE) {
+ showException(SQL,"optimizer"," 'mitosis' needs
'mergetable'\n");
+ error++;
+ }
if ( --i >= 0 && optimizers[i] && strcmp(optimizers[i],"multiplex") ){
showException(SQL,"optimizer"," 'multiplex' should be the
last\n");
------------------------------------------------------------------------------
OpenSolaris 2009.06 is a cutting edge operating system for enterprises
looking to deploy the next generation of Solaris that includes the latest
innovations from Sun and the OpenSource community. Download a copy and
enjoy capabilities such as Networking, Storage and Virtualization.
Go to: http://p.sf.net/sfu/opensolaris-get
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
