MonetDB: malparsing - Fixing minor issues in the optimizers

[Martin Kersten]

Changeset: 34ab9bc4e0f9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=34ab9bc4e0f9
Modified Files:
        monetdb5/optimizer/opt_evaluate.c
        monetdb5/optimizer/opt_generator.c
        monetdb5/optimizer/opt_mergetable.c
        monetdb5/optimizer/opt_remap.c
        monetdb5/optimizer/opt_support.c
Branch: malparsing
Log Message:

Fixing minor issues in the optimizers


diffs (70 lines):

diff --git a/monetdb5/optimizer/opt_evaluate.c 
b/monetdb5/optimizer/opt_evaluate.c
--- a/monetdb5/optimizer/opt_evaluate.c
+++ b/monetdb5/optimizer/opt_evaluate.c
@@ -243,7 +243,7 @@ OPTevaluateImplementation(Client cntxt, 
 
     /* Defense line against incorrect plans */
        /* Plan is unaffected */
-       // chkTypes(cntxt->usermodule, mb, FALSE);
+       chkTypes(cntxt->usermodule, mb, FALSE);
        // chkFlow(mb);
        // chkDeclarations(mb);
     
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
@@ -118,8 +118,7 @@ OPTgeneratorImplementation(Client cntxt,
                        errorCheck(p,algebraRef,getArg(p,2));
                } else if ( getModuleId(p) == sqlRef && getFunctionId(p) ==  
putName("exportValue") && isaBatType(getArgType(mb,p,0)) ){
                        // interface expects scalar type only, not expressable 
in MAL signature
-                       mb->errors++;
-                       showException(cntxt->fdout, MAL, "generate_series", 
"internal error, generate_series is a table producing function");
+                       mb->errors=createException(MAL, "generate_series", 
"internal error, generate_series is a table producing function");
                }else if ( getModuleId(p) == batcalcRef && getFunctionId(p) == 
bteRef && series[getArg(p,1)] && p->argc == 2 ){
                        casting(bte);
                } else if ( getModuleId(p) == batcalcRef && getFunctionId(p) == 
shtRef && series[getArg(p,1)] && p->argc == 2 ){
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
@@ -699,7 +699,7 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb, 
 
                if (split < 0) {
                        GDKfree(mats);
-                       mb->errors++;
+                       mb->errors= createException(MAL,"mergetable.join"," 
incorrect split level");
                        return ;
                }
                /* now detect split point */
@@ -1870,7 +1870,7 @@ OPTmergetableImplementation(Client cntxt
        }
 #endif
 
-       if ( mb->errors == 0) {
+       if ( mb->errors == MAL_SUCCEED) {
                for(i=0; i<slimit; i++)
                        if (old[i]) 
                                freeInstruction(old[i]);
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
@@ -290,7 +290,6 @@ terminateMX:
        delArgument(p,1);
        inlineMALblock(mb,pc,mq);
 #ifdef DEBUG_OPT_REMAP
-       fprintInstruction(stderr,mb,0,p,LIST_MAL_ALL);
        fprintf(stderr,"#NEW BLOCK\n");
        fprintFunction(stderr,mq, 0, LIST_MAL_ALL);
        fprintf(stderr,"#INLINED RESULT\n");
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -151,9 +151,6 @@ wrapup:
                snprintf(buf, 256, "%-20s actions=%2d time=" LLFMT " usec", 
"total", actions, mb->optimize);
                newComment(mb, buf);
        }
-       if (msg != MAL_SUCCEED) {
-               mb->errors++;
-       }
        if (cnt >= mb->stop)
                throw(MAL, "optimizer.MALoptimizer", OPTIMIZER_CYCLE);
        return msg;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list