MonetDB: mosaic - Move garbage collection.

[Martin Kersten]

Changeset: fcfd15f16cfa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fcfd15f16cfa
Modified Files:
        sql/backends/monet5/sql.c
Branch: mosaic
Log Message:

Move garbage collection.


diffs (21 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4086,8 +4086,6 @@ sql_storage(Client cntxt, MalBlkPtr mb, 
        if (sch == NULL || tab == NULL || col == NULL || type == NULL || mode 
== NULL || loc == NULL || imprints == NULL || 
            sort == NULL || cnt == NULL || atom == NULL || size == NULL || heap 
== NULL || indices == NULL || phash == NULL ||
            revsort == NULL || key == NULL || oidx == NULL || compressed == 
NULL) {
-               if (compressed)
-                       BBPunfix(compressed->batCacheid);
                goto bailout;
        }
        if( pci->argc - pci->retc >= 1)
@@ -4395,6 +4393,8 @@ sql_storage(Client cntxt, MalBlkPtr mb, 
                BBPunfix(key->batCacheid);
        if (oidx)
                BBPunfix(oidx->batCacheid);
+       if (compressed)
+               BBPunfix(compressed->batCacheid);
        throw(SQL, "sql.storage", SQLSTATE(HY001) MAL_MALLOC_FAIL);
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list