MonetDB: default - limit the size of the new stmt array in the g...

[Niels Nes]

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

limit the size of the new stmt array in the generator optimizer


diffs (50 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
@@ -78,11 +78,11 @@ OPTgeneratorImplementation(Client cntxt,
        (void) pci;
 
        series = (InstrPtr*) GDKzalloc(sizeof(InstrPtr) * mb->vtop);
-    old= mb->stmt;
-    limit = mb->stop;
-    if ( newMalBlkStmt(mb,2 * mb->ssize) < 0) {
+       old = mb->stmt;
+       limit = mb->stop;
+       if (newMalBlkStmt(mb, 2 * limit) < 0) {
                GDKfree(series);
-        return 0;
+               return 0;
        }
 
        for( i=0; i < limit; i++){
@@ -157,9 +157,9 @@ OPTgeneratorImplementation(Client cntxt,
                }
        }
        for (i++; i < limit; i++)
-        pushInstruction(mb, old[i]);
-    GDKfree(old);
-    GDKfree(series);
+               pushInstruction(mb, old[i]);
+       GDKfree(old);
+       GDKfree(series);
 
 #ifdef VLT_DEBUG
        printFunction(cntxt->fdout,mb,0,LIST_MAL_ALL);
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -172,10 +172,10 @@ str OPTwrapper (Client cntxt, MalBlkPtr 
 
 
        for ( i=0; codes[i].nme; i++)
-       if ( strcmp(codes[i].nme, optimizer)== 0 ){
-               actions = (int)(*(codes[i].fcn))(cntxt, mb, stk,0);
-               break;  
-       }
+               if ( strcmp(codes[i].nme, optimizer)== 0 ){
+                       actions = (int)(*(codes[i].fcn))(cntxt, mb, stk,0);
+                       break;  
+               }
        if ( codes[i].nme == 0){
                freeInstruction(q);
                throw(MAL, optimizer, RUNTIME_OBJECT_UNDEFINED ":%s.%s", 
modnme, fcnnme);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list