Changeset: 0d8d207882b0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d8d207882b0
Modified Files:
        monetdb5/optimizer/opt_partition.mx
Branch: default
Log Message:

opt_partition: remove set but not used variables

the assert is not always visible to the compiler, so avoid declaring
a variable just for that

remove entire pc, since it's only set, not used


diffs (35 lines):

diff --git a/monetdb5/optimizer/opt_partition.mx 
b/monetdb5/optimizer/opt_partition.mx
--- a/monetdb5/optimizer/opt_partition.mx
+++ b/monetdb5/optimizer/opt_partition.mx
@@ -634,12 +634,10 @@ remapVariable( MalBlkPtr mb, int i, int 
 static int
 OPTcollect(Client cntxt, MalBlkPtr mb, int pc, Slices *slices)
 {
-       InstrPtr p;
        int  parallel;
        Lifespan span = setLifespan(mb);
 
-       p = getInstrPtr(mb, pc);
-       assert(p->token == ASSIGNsymbol);
+       assert(getInstrPtr(mb,pc)->token == ASSIGNsymbol);
        /* locate all variables used beyond this point but introduced before */
        if( (parallel = OPTparallelcode(cntxt, mb, pc, slices) ) ) {
        } /* else no parallelism, just a multi-assignment */
@@ -819,7 +817,7 @@ OPTplanFragment(Client cntxt, MalBlkPtr 
 static int
 OPTpartitionImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci)
 {
-       int i,j,k,pc = 0;
+       int i,j,k;
        wrd r = 0, rowcnt=0;    /* table should be sizeable to consider 
parallel execution*/
        InstrPtr p,q, target= 0, rsset=0;
        Slices slices;
@@ -942,8 +940,6 @@ OPTpartitionImplementation(Client cntxt,
                        }
                        continue;
                }
-               if ( p->token == ENDsymbol)
-                       pc = i -1;
        }
 #ifdef DEBUG_DETAIL
        mnstr_printf(cntxt->fdout,"#orig BEFORE optimizer test\n");
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to