MonetDB: Jun2020-mmt - Merged with Jun2020

[Pedro Ferreira]

Changeset: a203c76724b6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a203c76724b6
Branch: Jun2020-mmt
Log Message:

Merged with Jun2020


diffs (53 lines):

diff --git a/monetdb5/optimizer/opt_emptybind.c 
b/monetdb5/optimizer/opt_emptybind.c
--- a/monetdb5/optimizer/opt_emptybind.c
+++ b/monetdb5/optimizer/opt_emptybind.c
@@ -35,21 +35,6 @@
        }  } while (0)
 
 
-static int
-withoutMitosis(MalBlkPtr mb)
-{
-       InstrPtr p;
-
-       for(int i = mb->stop-1; i>=0; i--) {
-               p = mb->stmt[i];
-               if (p->token == ENDsymbol)
-                       break;
-               if (getFunctionId(p) == mitosisRef)
-                       return (p->token == REMsymbol);
-    }
-       return 0;
-}
-
 str
 OPTemptybindImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci)
 {
@@ -62,7 +47,6 @@ OPTemptybindImplementation(Client cntxt,
        str sch,tbl;
        int etop= 0, esize= 256;
        str msg = MAL_SUCCEED;
-       int no_mitosis = withoutMitosis(mb);
 
        (void) stk;
        (void) cntxt;
@@ -211,19 +195,6 @@ OPTemptybindImplementation(Client cntxt,
                                continue;
                        }
                }
-               // delta operations without updates can be replaced by an pack 
of base and inserts
-               if (getModuleId(p)== sqlRef && getFunctionId(p) == deltaRef  && 
p->argc == 5){
-                       if (no_mitosis && empty[getArg(p,2)] && 
empty[getArg(p,3)]){
-                               actions++;
-                               clrFunction(p);
-                               setModuleId(p,matRef);
-                               setFunctionId(p,packRef);
-                               p->argc = 3;
-                               getArg(p, 2) = getArg(p, 4);
-                               p->typechk= TYPE_UNKNOWN;
-                       }
-                       continue;
-               }
 
                if (getModuleId(p)== sqlRef && getFunctionId(p) == 
projectdeltaRef) {
                        if( empty[getArg(p,3)] && empty[getArg(p,4)] ){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list