MonetDB: default - Add defense lines against double optimizer calls

[Martin Kersten]

Changeset: eb15bb6ea479 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb15bb6ea479
Modified Files:
        monetdb5/optimizer/opt_mergetable.c
        monetdb5/optimizer/opt_mitosis.c
Branch: default
Log Message:

Add defense lines against double optimizer calls


diffs (24 lines):

diff --git a/monetdb5/optimizer/opt_mergetable.c 
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -1569,7 +1569,7 @@ OPTmergetableImplementation(Client cntxt
        char buf[256];
        lng usec = GDKusec();
 
-       if( optimizerIsApplied(mb, "mergetable"))
+       if( optimizerIsApplied(mb, "mergetable") || 
optimizerIsApplied(mb,"projectionpath"))
                return 0;
        old = mb->stmt;
        oldtop= mb->stop;
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -43,6 +43,8 @@ OPTmitosisImplementation(Client cntxt, M
        char buf[256];
        lng usec = GDKusec();
 
+       if ( optimizerIsApplied(mb,"mitosis") || 
optimizerIsApplied(mb,"projectionpath"))
+               return 0;
        (void) cntxt;
        (void) stk;
        if (!eligible(mb))
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list