MonetDB: default - zap min/max on writes

[Niels Nes]

Changeset: 9554336b2e05 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9554336b2e05
Modified Files:
        sql/src/storage/bat/bat_storage.mx
Branch: default
Log Message:

zap min/max on writes


diffs (51 lines):

diff -r 79646e95efd0 -r 9554336b2e05 sql/src/storage/bat/bat_storage.mx
--- a/sql/src/storage/bat/bat_storage.mx        Fri May 21 20:21:01 2010 +0200
+++ b/sql/src/storage/bat/bat_storage.mx        Fri May 21 20:32:50 2010 +0200
@@ -1167,6 +1167,15 @@
        return clear_dbat(tr, t->data);
 }
 
+void
+BATcleanProps( BAT *b )
+{
+       if (b->T->props) {
+               PROPdestroy(b->T->props);
+               b->T->props = NULL;
+       }
+}
+
 int 
 gtr_update_delta( sql_trans *tr, sql_delta *cbat)
 {
@@ -1184,6 +1193,7 @@
                                BATmmap(cur, STORE_MMAP, STORE_MMAP, 
STORE_MMAP, STORE_MMAP);
                }
                BATappend(cur,ins,TRUE);
+               BATcleanProps(cur);
                temp_destroy(cbat->ibid);
                cbat->ibid = e_bat(cur->ttype);
        }
@@ -1340,6 +1350,7 @@
                        }
                        assert(obat->ibase == cbat->ibase);
                        append_inserted(ci, ins);
+                       BATcleanProps(ci);
                        bat_destroy(ci);
                }
                obat->cnt = cbat->cnt;
@@ -1362,6 +1373,7 @@
                                                BATmmap(cur, STORE_MMAP, 
STORE_MMAP, STORE_MMAP, STORE_MMAP);
                                }
                                BATappend(cur,ins,TRUE);
+                               BATcleanProps(cur);
                                temp_destroy(cbat->ibid);
                                cbat->ibid = e_bat(cur->ttype);
                        }
@@ -1391,6 +1403,7 @@
                        /* should be insert_inserted */
                        BATins(cu, ups, TRUE);
                        BATreplace(cu, ups, TRUE);
+                       BATcleanProps(cu);
                        bat_destroy(cu);
                }
                if (store_nr_active == 1 && !cluster) { /* flush all */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list