MonetDB: default - Reset the variable id counter

[Martin Kersten]

Changeset: 459d9a07ec21 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=459d9a07ec21
Modified Files:
        monetdb5/mal/mal_instruction.c
Branch: default
Log Message:

Reset the variable id counter


diffs (32 lines):

diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -899,6 +899,7 @@ void
 trimMalVariables_(MalBlkPtr mb, bit *used, MalStkPtr glb)
 {
        int *vars, cnt = 0, i, j;
+       int maxid = 0,m;
        InstrPtr q;
 
        vars = (int *) GDKzalloc(mb->vtop * sizeof(int));
@@ -913,6 +914,11 @@ trimMalVariables_(MalBlkPtr mb, bit *use
                        freeVariable(mb, i);
                        continue;
                }
+               if( isTmpVar(mb,i) ){
+                       m = atoi(getVarName(mb,i)+2);
+                       if( m > maxid)
+                               maxid = m;
+               }
         if (i > cnt) {
             /* remap temporary variables */
             VarRecord *t = mb->var[cnt];
@@ -943,6 +949,8 @@ trimMalVariables_(MalBlkPtr mb, bit *use
                                getArg(q, j) = vars[getArg(q, j)];
                }
        }
+       /* reset the variable counter */
+       mb->vid= maxid + 1;
 #ifdef DEBUG_REDUCE
        mnstr_printf(GDKout, "After reduction \n");
        printFunction(GDKout, mb, 0, 0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list