MonetDB: default - Just ignore simple expressions

[Martin Kersten]

Changeset: 9ec88895b319 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9ec88895b319
Modified Files:
        monetdb5/optimizer/opt_dataflow.mx
Branch: default
Log Message:

Just ignore simple expressions
but require that all others are directlye related.


diffs (16 lines):

diff --git a/monetdb5/optimizer/opt_dataflow.mx 
b/monetdb5/optimizer/opt_dataflow.mx
--- a/monetdb5/optimizer/opt_dataflow.mx
+++ b/monetdb5/optimizer/opt_dataflow.mx
@@ -130,10 +130,10 @@ simpleFlow(InstrPtr *old, int start, int
                        if( getArg(p,0) == getArg(q,j))
                                simple= TRUE;
                if( !simple)
-                       simple = getModuleId(p) == calcRef || getModuleId(p) == 
mtimeRef || getModuleId(p) == strRef || getModuleId(p)== mmathRef;
+                       simple = getModuleId(q) == calcRef || getModuleId(q) == 
mtimeRef || getModuleId(q) == strRef || getModuleId(q)== mmathRef;
+               else p = q;
                if( !simple)
                        return 0;
-               p = q;
        }
        return 1;
 }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list