Update of /cvsroot/monetdb/MonetDB5/src/optimizer
In directory sc8-pr-cvs16:/tmp/cvs-serv11029

Modified Files:
        opt_commonTerms.mx 
Log Message:
Be a little bit more strict in common term replacement.


Index: opt_commonTerms.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_commonTerms.mx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- opt_commonTerms.mx  27 Apr 2007 12:33:09 -0000      1.15
+++ opt_commonTerms.mx  20 May 2007 09:55:16 -0000      1.16
@@ -29,7 +29,7 @@
 #include "opt_prelude.h"
 #include "opt_support.h"
 
-/* #define DEBUG_OPT_COMMONTERMS     show partial result */
+/* #define DEBUG_OPT_COMMONTERMS      show partial result */
 
 #endif
 @c
@@ -184,7 +184,12 @@
                                        !hasSideEffects(q, TRUE));
 
 #endif
-                               if (hasSameSignature(p, q) && 
[EMAIL PROTECTED]
+Simple assignments are not replaced either. They should be
+handled by the alias removal part
[EMAIL PROTECTED]
+                               if (q->token != ASSIGNsymbol &&
+                                       hasSameSignature(p, q) && 
                                        hasSameArguments(mb, p, q) && 
                                        !isUpdated(mb, i) && 
                                        !hasCommonResults(p, q) && 


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to