MonetDB: default - Reduce optimizer cost

[Martin Kersten]

Changeset: 727821377f76 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=727821377f76
Modified Files:
        monetdb5/optimizer/opt_generator.c
        monetdb5/optimizer/opt_matpack.c
Branch: default
Log Message:

Reduce optimizer cost


diffs (51 lines):

diff --git a/monetdb5/optimizer/opt_generator.c 
b/monetdb5/optimizer/opt_generator.c
--- a/monetdb5/optimizer/opt_generator.c
+++ b/monetdb5/optimizer/opt_generator.c
@@ -159,11 +159,10 @@ OPTgeneratorImplementation(Client cntxt,
 #endif
 
     /* Defense line against incorrect plans */
-    if( actions > 0){
-        chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
-        chkFlow(cntxt->fdout, mb);
-        chkDeclarations(cntxt->fdout, mb);
-    }
+       /* all new/modified statements are already checked */
+       //chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
+       //chkFlow(cntxt->fdout, mb);
+       //chkDeclarations(cntxt->fdout, mb);
     /* keep all actions taken as a post block comment */
     snprintf(buf,256,"%-20s actions=%2d time=" LLFMT " 
usec","generator",actions,GDKusec() - usec);
     newComment(mb,buf);
diff --git a/monetdb5/optimizer/opt_matpack.c b/monetdb5/optimizer/opt_matpack.c
--- a/monetdb5/optimizer/opt_matpack.c
+++ b/monetdb5/optimizer/opt_matpack.c
@@ -40,6 +40,7 @@ OPTmatpackImplementation(Client cntxt, M
                        setVarType(mb,v,getArgType(mb,p,1));
                        q = pushArgument(mb, q, getArg(p,1));
                        q = pushInt(mb,q, p->argc - p->retc);
+                       typeChecker(cntxt->fdout, cntxt->nspace,mb,q,TRUE);
 
                        for ( j = 2; j < p->argc; j++) {
                                q = newStmt(mb,matRef, packIncrementRef);
@@ -47,6 +48,7 @@ OPTmatpackImplementation(Client cntxt, M
                                q = pushArgument(mb, q, getArg(p,j));
                                setVarType(mb,getArg(q,0),getVarType(mb,v));
                                v = getArg(q,0);
+                               typeChecker(cntxt->fdout, 
cntxt->nspace,mb,q,TRUE);
                        }
                        getArg(q,0) = getArg(p,0);
                        freeInstruction(p);
@@ -62,9 +64,9 @@ OPTmatpackImplementation(Client cntxt, M
 
     /* Defense line against incorrect plans */
     if( actions > 0){
-        chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
-        chkFlow(cntxt->fdout, mb);
-        chkDeclarations(cntxt->fdout, mb);
+        //chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
+        //chkFlow(cntxt->fdout, mb);
+        //chkDeclarations(cntxt->fdout, mb);
     }
     /* keep all actions taken as a post block comment */
     snprintf(buf,256,"%-20s actions=%2d time=" LLFMT " 
usec","matpack",actions,GDKusec() - usec);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list