MonetDB: Oct2010 - When freeing variables, you must also delete ...

[Sjoerd Mullender]

Changeset: 14ff7882903e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14ff7882903e
Modified Files:
        sql/src/backends/monet5/sql_scenario.mx
Branch: Oct2010
Log Message:

When freeing variables, you must also delete properties that refer to the freed 
variables.
This is a prerequisite for fixing bug 2620.


diffs (27 lines):

diff -r 4315a44b501d -r 14ff7882903e sql/src/backends/monet5/sql_scenario.mx
--- a/sql/src/backends/monet5/sql_scenario.mx   Wed Sep 08 10:55:21 2010 +0200
+++ b/sql/src/backends/monet5/sql_scenario.mx   Wed Sep 08 13:48:02 2010 +0200
@@ -570,7 +570,7 @@
 static void
 freeVariables(Client c, MalBlkPtr mb, MalStkPtr glb, int start)
 {
-       int i;
+       int i, j;
 
        for (i = start; i < mb->vtop;) {
                if (glb) {
@@ -585,6 +585,14 @@
                i++;
        }
        mb->vtop = start;
+       for (i = j = 0; i < mb->ptop; i++) {
+               if (mb->prps[i].var < start) {
+                       if (i > j)
+                               mb->prps[j] = mb->prps[i];
+                       j++;
+               }
+       }
+       mb->ptop = j;
 }
 
 /* #define _SQL_COMPILE */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list