MonetDB: default - rollback_delta is a void function.

[Aris Koning]

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

rollback_delta is a void function.


diffs (52 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
@@ -4127,8 +4127,7 @@ merge_cs( column_storage *cs)
                temp_destroy(cs->uvbid);
                cs->uibid = e_bat(TYPE_oid);
                cs->uvbid = e_bat(cur->ttype);
-               if (cs->uibid == BID_NIL || cs->uvbid == BID_NIL)
-                       ok = LOG_ERR;
+               assert(cs->uibid != BID_NIL && cs->uvbid != BID_NIL); // Should 
be pre-allocated.
                cs->ucnt = 0;
                bat_destroy(ui);
                bat_destroy(uv);
@@ -4192,7 +4191,7 @@ savepoint_commit_delta( sql_delta *delta
        return delta;
 }
 
-static int
+static void
 rollback_delta(sql_trans *tr, sql_delta *delta, int type)
 {
        (void)tr;
@@ -4202,10 +4201,8 @@ rollback_delta(sql_trans *tr, sql_delta 
                temp_destroy(delta->cs.uvbid);
                delta->cs.uibid = e_bat(TYPE_oid);
                delta->cs.uvbid = e_bat(type);
-               if (delta->cs.uibid == BID_NIL || delta->cs.uvbid == BID_NIL)
-                       return LOG_ERR;
+               assert(delta->cs.uibid != BID_NIL && delta->cs.uvbid != 
BID_NIL); // Should be pre-allocated.
        }
-       return LOG_OK;
 }
 
 static int
@@ -4237,7 +4234,7 @@ commit_update_col_( sql_trans *tr, sql_c
                        }
                } else { /* rollback */
                        if (c->t->commit_action == CA_COMMIT/* || 
c->t->commit_action == CA_PRESERVE*/) {
-                               ok = rollback_delta(tr, delta, 
c->type.type->localtype);
+                               rollback_delta(tr, delta, 
c->type.type->localtype);
                        } else if (clear_cs(tr, &delta->cs, true, 
isTempTable(c->t)) == BUN_NONE) {
                                ok = LOG_ERR; /* CA_DELETE as CA_DROP's are 
gone already (or for globals are equal to a CA_DELETE) */
                        }
@@ -4348,7 +4345,7 @@ commit_update_idx_( sql_trans *tr, sql_i
                        }
                } else { /* rollback */
                        if (i->t->commit_action == CA_COMMIT/* || 
i->t->commit_action == CA_PRESERVE*/) {
-                               ok = rollback_delta(tr, delta, type);
+                               rollback_delta(tr, delta, type);
                        } else if (clear_cs(tr, &delta->cs, true, 
isTempTable(i->t)) == BUN_NONE) {
                                ok = LOG_ERR; /* CA_DELETE as CA_DROP's are 
gone already */
                        }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org