MonetDB: Feb2013 - fix some more leaks

[Niels Nes]

Changeset: f146af5440c1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f146af5440c1
Modified Files:
        monetdb5/optimizer/opt_mitosis.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_remap.c
Branch: Feb2013
Log Message:

fix some more leaks


diffs (60 lines):

diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -42,7 +42,7 @@ eligible(MalBlkPtr mb)
 int
 OPTmitosisImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
 {
-       int i, j, limit, estimate = 0, pieces = 1, mito_parts = 0, mito_size = 
0, row_size = 0;
+       int i, j, limit, slimit, estimate = 0, pieces = 1, mito_parts = 0, 
mito_size = 0, row_size = 0;
        str schema = 0, table = 0;
        wrd r = 0, rowcnt = 0;    /* table should be sizeable to consider 
parallel execution*/
        InstrPtr q, *old, target = 0;
@@ -165,6 +165,7 @@ OPTmitosisImplementation(Client cntxt, M
                return 0;
 
        limit = mb->stop;
+       slimit = mb->ssize;
        if (newMalBlkStmt(mb, mb->ssize + 2 * estimate) < 0)
                return 0;
        estimate = 0;
@@ -245,6 +246,9 @@ OPTmitosisImplementation(Client cntxt, M
        for (; i<limit; i++) 
                if (old[i])
                        pushInstruction(mb,old[i]);
+       for (; i<slimit; i++) 
+               if (old[i])
+                       freeInstruction(old[i]);
        GDKfree(old);
        return 1;
 }
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -575,8 +575,6 @@ addOptimizerPipe(Client cntxt, MalBlkPtr
        InstrPtr p;
        str msg = MAL_SUCCEED;
 
-       (void) cntxt;
-
        for (i = 0; i < MAXOPTPIPES && pipes[i].name; i++)
                if (strcmp(pipes[i].name, name) == 0)
                        break;
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
@@ -451,13 +451,8 @@ OPTremapImplementation(Client cntxt, Mal
                printFunction(cntxt->fdout, mb, 0,  LIST_MAL_ALL);
        }
 
-       if (doit) {
+       if (doit) 
                chkTypes(cntxt->fdout, cntxt->nspace,mb,TRUE);
-               /* clean out on errors by resetting the block */
-               if ( mb->errors)
-               for( i=1;i<slimit; i++){
-               }
-       }
        return mb->errors? 0: doit;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list