Changeset: 39357bebe527 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/39357bebe527
Modified Files:
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: default
Log Message:
add return's to merge_cs
diffs (81 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
@@ -4091,6 +4091,7 @@ merge_cs( column_storage *cs, const char
bat_destroy(uv);
bat_destroy(cur);
GDKfatal(FATAL_MERGE_FAILURE, caller);
+ return;
}
assert(BATcount(ui) == BATcount(uv));
@@ -4101,6 +4102,7 @@ merge_cs( column_storage *cs, const char
bat_destroy(uv);
bat_destroy(cur);
GDKfatal(FATAL_MERGE_FAILURE, caller);
+ return;
}
/* cleanup the old deltas */
temp_destroy(cs->uibid);
@@ -4245,7 +4247,7 @@ commit_update_delta( sql_trans *tr, sql_
if (!commit_ts) { /* rollback */
sql_delta *d = change->data, *o = ATOMIC_PTR_GET(data);
- if (change->ts && t->base.new) /* handled by create col */
+ if (change->foobar_ts && t->base.new) /* handled by create col
*/
return LOG_OK;
if (o != d) {
while(o && o->next != d)
@@ -4380,7 +4382,7 @@ commit_update_del( sql_trans *tr, sql_ch
lock_table(tr->store, t->base.id);
if (!commit_ts) { /* rollback */
if (dbat->cs.ts == tr->tid) {
- if (change->ts && t->base.new) { /* handled by the
create table */
+ if (change->foobar_ts && t->base.new) { /* handled by
the create table */
unlock_table(tr->store, t->base.id);
return ok;
}
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -523,7 +523,7 @@ typedef struct sql_dependency_change {
typedef struct sql_change {
sql_base *obj;
- ulng ts; /* commit/rollback timestamp */
+ ulng foobar_ts; /* commit/rollback timestamp */
void *data; /* data changes */
bool committed; /* commit or rollback */
bool handled; /* handled in commit */
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2266,8 +2266,8 @@ store_pending_changes(sqlstore *store, u
if (c->cleanup(store, c, oldest)) {
list_remove_node(store->changes, store, n);
_DELETE(c);
- } else if (c->ts < oldest_changes) {
- oldest_changes = c->ts;
+ } else if (c->foobar_ts < oldest_changes) {
+ oldest_changes = c->foobar_ts;
}
n = next;
}
@@ -3598,7 +3598,7 @@ sql_trans_rollback(sql_trans *tr, bool c
if (c->commit)
c->commit(tr, c, 0 /* ie rollback */, oldest);
- c->ts = commit_ts;
+ c->foobar_ts = commit_ts;
}
store_pending_changes(store, oldest);
for(node *n=nl->h; n; n = n->next) {
@@ -3960,7 +3960,7 @@ sql_trans_commit(sql_trans *tr)
ok = c->commit(tr, c, commit_ts, oldest);
else
c->obj->new = 0;
- c->ts = commit_ts;
+ c->foobar_ts = commit_ts;
}
/* propagate transaction dependencies to the storage only if
other transactions are running */
if (ok == LOG_OK && !tr->parent &&
ATOMIC_GET(&store->nr_active) > 1) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
