MonetDB: default - return null and cleanup instead of asserts

[Niels Nes via checkin-list]

Changeset: a690a976581c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a690a976581c
Modified Files:
        sql/storage/bat/bat_storage.c
Branch: default
Log Message:

return null and cleanup instead of asserts


diffs (51 lines):

diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -1136,7 +1136,8 @@ dict_append_bat(sql_trans *tr, sql_delta
                return NULL;
        BUN max_cnt = (BATcount(u) < 256)?256:64*1024;
        if (DICTprepare4append(&newoffsets, i, u) < 0) {
-               assert(0);
+               bat_destroy(u);
+               return NULL;
        } else {
                int new = 0;
                /* returns new offset bat (ie to be appended), possibly with 
larger type ! */
@@ -1255,7 +1256,8 @@ for_append_bat(column_storage *cs, BAT *
                return NULL;
 
        if (FORprepare4append(&newoffsets, i, offsetval, b->ttype) < 0) {
-               assert(0);
+               bat_destroy(b);
+               return NULL;
        } else {
                /* returns new offset bat if values within min/max, else 
decompress */
                if (!newoffsets) { /* decompress */
@@ -1707,7 +1709,8 @@ dict_append_val(sql_trans *tr, sql_delta
                return NULL;
        BUN max_cnt = (BATcount(u) < 256)?256:64*1024;
        if (DICTprepare4append_vals(&newoffsets, i, cnt, u) < 0) {
-               assert(0);
+               bat_destroy(u);
+               return NULL;
        } else {
                int new = 0;
                /* returns new offset bat (ie to be appended), possibly with 
larger type ! */
@@ -1810,7 +1813,8 @@ for_append_val(column_storage *cs, void 
                return NULL;
 
        if (FORprepare4append_vals(&newoffsets, i, cnt, offsetval, tt, 
b->ttype) < 0) {
-               assert(0);
+               bat_destroy(b);
+               return NULL;
        } else {
                /* returns new offset bat if values within min/max, else 
decompress */
                if (!newoffsets) {
@@ -4348,7 +4352,6 @@ static storage *
 savepoint_commit_storage( storage *dbat, ulng commit_ts)
 {
        if (dbat && dbat->cs.ts == commit_ts && dbat->next) {
-               assert(0);
                storage *od = dbat->next;
                if (od->cs.ts == commit_ts) {
                        storage t = *od, *n = od->next;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org