MonetDB: Jul2017_1-GC - Backing-out changesets aebb813568b4, c68...

[Stefan Manegold]

Changeset: bc0b0355a506 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc0b0355a506
Modified Files:
        monetdb5/optimizer/opt_garbageCollector.c
Branch: Jul2017_1-GC
Log Message:

Backing-out changesets aebb813568b4, c68f57e45fe2, d350ab890b8e, 7e644e67e308,
which effectively disabled ("early") MAL variable clean-up (garbage collection)
between Dec2016 & Jul2017
(here: changeset c68f57e45fe2).


diffs (21 lines):

diff --git a/monetdb5/optimizer/opt_garbageCollector.c 
b/monetdb5/optimizer/opt_garbageCollector.c
--- a/monetdb5/optimizer/opt_garbageCollector.c
+++ b/monetdb5/optimizer/opt_garbageCollector.c
@@ -40,7 +40,7 @@ OPTgarbageCollectorImplementation(Client
        varlnk = (int*) GDKzalloc(mb->vtop * sizeof(int));
        if( varlnk == NULL)
                return 0;
-       stmtlnk = (int*) GDKzalloc((mb->stop + 1) * sizeof(int));
+       stmtlnk = (int*) GDKzalloc(mb->stop * sizeof(int));
        if( stmtlnk == NULL){
                GDKfree(varlnk);
                return 0;
@@ -70,8 +70,6 @@ OPTgarbageCollectorImplementation(Client
        // Construct the linked list of variables based on end-of-scope
        setVariableScope(mb);
        for( i = 0; i < mb->vtop; i++){
-               assert(getEndScope(mb,i) >= 0);
-               assert(getEndScope(mb,i) <= mb->stop);
          varlnk[i] = stmtlnk[getEndScope(mb,i)];
          stmtlnk[getEndScope(mb,i)] = i;
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list