MonetDB: default - These optimizers have more triggering cases

[Pedro Ferreira]

Changeset: febe5beee765 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=febe5beee765
Modified Files:
        monetdb5/optimizer/opt_projectionpath.c
        monetdb5/optimizer/opt_remap.c
Branch: default
Log Message:

These optimizers have more triggering cases


diffs (35 lines):

diff --git a/monetdb5/optimizer/opt_projectionpath.c 
b/monetdb5/optimizer/opt_projectionpath.c
--- a/monetdb5/optimizer/opt_projectionpath.c
+++ b/monetdb5/optimizer/opt_projectionpath.c
@@ -148,10 +148,9 @@ OPTprojectionpathImplementation(Client c
        //if ( optimizerIsApplied(mb,"projectionpath") )
                //return 0;
 
-
        for( i = 0; i < mb->stop ; i++){
                p = getInstrPtr(mb,i);
-               if ( getFunctionId(p) == projectionpathRef ){
+               if ( getModuleId(p) == algebraRef && ((getFunctionId(p) == 
projectionRef && p->argc == 3) || getFunctionId(p) == projectionpathRef) ){
                        break;
                }
        }
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -372,7 +372,6 @@ OPTremapSwitched(Client cntxt, MalBlkPtr
 str
 OPTremapImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
-
        InstrPtr *old, p;
        int i, limit, slimit, doit= 0;
        Module scope = cntxt->usermodule;
@@ -382,7 +381,7 @@ OPTremapImplementation(Client cntxt, Mal
 
        for( i=0; i< mb->stop; i++){
                p = getInstrPtr(mb, i);
-               if (isMultiplex(p)){
+               if (isMultiplex(p) || (p->argc == 4 && getModuleId(p) == 
aggrRef && getFunctionId(p) == avgRef)){
                        break;
                }
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list