MonetDB: Jan2022 - The way to declare mal optimizer number of ac...

[Pedro Ferreira]

Changeset: 85faec4af71c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/85faec4af71c
Modified Files:
        monetdb5/optimizer/opt_strimps.c
Branch: Jan2022
Log Message:

The way to declare mal optimizer number of actions has changed


diffs (44 lines):

diff --git a/monetdb5/optimizer/opt_strimps.c b/monetdb5/optimizer/opt_strimps.c
--- a/monetdb5/optimizer/opt_strimps.c
+++ b/monetdb5/optimizer/opt_strimps.c
@@ -27,8 +27,6 @@ OPTstrimpsImplementation(Client cntxt, M
        bool needed = false;
        // int mvcvar = -1;
        InstrPtr p, q, *old = mb->stmt;
-       char buf[256];
-       lng usec = GDKusec();
        str msg = MAL_SUCCEED;
        int res;
 
@@ -94,20 +92,17 @@ OPTstrimpsImplementation(Client cntxt, M
                        freeInstruction(old[i]);
        GDKfree(old);
 
-    /* Defense line against incorrect plans */
-    if (actions){
-        msg = chkTypes(cntxt->usermodule, mb, FALSE);
-       if (!msg)
-               msg = chkFlow(mb);
-       if (!msg)
-               msg = chkDeclarations(mb);
-    }
-    /* keep all actions taken as a post block comment */
+       /* Defense line against incorrect plans */
+       if (actions){
+               msg = chkTypes(cntxt->usermodule, mb, FALSE);
+               if (!msg)
+                       msg = chkFlow(mb);
+               if (!msg)
+                       msg = chkDeclarations(mb);
+       }
+       /* keep all actions taken as a post block comment */
 bailout:
-       usec = GDKusec()- usec;
-       snprintf(buf,256,"%-20s actions=%2d time=" LLFMT " 
usec","strimps",actions,usec);
-       newComment(mb,buf);
-       if( actions > 0)
-               addtoMalBlkHistory(mb);
+       /* keep actions taken as a fake argument*/
+       (void) pushInt(mb, pci, actions);
        return msg;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list