Changeset: 1f61471faeac for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1f61471faeac
Modified Files:
sql/storage/bat/bat_storage.c
sql/storage/objectset.c
sql/storage/store.c
Branch: tempscs2os
Log Message:
update TODOs
diffs (124 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
@@ -2348,7 +2348,6 @@ storage_delete_val(sql_trans *tr, sql_ta
}
}
unlock_table(tr->store, t->base.id);
- // TODO tempscs2os assert declared
if (!in_transaction)
trans_add(tr, &t->base, s, &tc_gc_del, &commit_update_del,
NOT_TO_BE_LOGGED(t) ? NULL : &log_update_del);
return LOG_OK;
@@ -3077,7 +3076,7 @@ log_create_col(sql_trans *tr, sql_change
static int
commit_create_delta( sql_trans *tr, sql_table *t, sql_base *base, sql_delta
*delta, ulng commit_ts, ulng oldest)
{
- (void) t; // TODO tempscs2os: remove if unnecessary
+ (void) t; // TODO transaction_layer_revam: remove if unnecessary
(void)oldest;
assert(delta->cs.ts == tr->tid);
delta->cs.ts = commit_ts;
@@ -3298,7 +3297,7 @@ create_del(sql_trans *tr, sql_table *t)
bat->cs.ts = tr->tid;
}
- if (!isNew(t) && !isTempTable(t)) { // TODO tempscs2os: figure out the
purpose
+ if (!isNew(t) && !isTempTable(t)) {
bat->cs.ts = tr->ts;
return load_storage(tr, t, bat, t->base.id);
} else if (bat->cs.bid) {
@@ -4082,7 +4081,7 @@ tc_gc_rollbacked_storage( sql_store Stor
static int
commit_update_delta( sql_trans *tr, sql_change *change, sql_table* t,
sql_base* base, ATOMIC_PTR_TYPE* data, int type, ulng commit_ts, ulng oldest)
{
- (void) type; // TODO tempscs2os remove if remains unused
+ (void) type; // TODO transaction_layer_revamremove if remains unused
sql_delta *delta = ATOMIC_PTR_GET(data);
@@ -4460,7 +4459,6 @@ claim_segmentsV2(sql_trans *tr, sql_tabl
unlock_table(tr->store, t->base.id);
/* hard to only add this once per transaction (probably want to change
to once per new segment) */
- // TODO tempscs2os assert declared
if (!in_transaction) {
trans_add(tr, &t->base, s, &tc_gc_del, &commit_update_del,
NOT_TO_BE_LOGGED(t) ? NULL : &log_update_del);
in_transaction = true;
diff --git a/sql/storage/objectset.c b/sql/storage/objectset.c
--- a/sql/storage/objectset.c
+++ b/sql/storage/objectset.c
@@ -403,7 +403,7 @@ objectversion_destroy(sqlstore *store, o
os->destroy(store, ov->b);
if (os->temporary && (state & deleted || state & under_destruction ||
state & rollbacked))
- os_destroy(os, store); // TODO tempscs2os : embed into
refcounting subproject : reference is already dropped by os_cleanup
+ os_destroy(os, store); // TODO transaction_layer_revam: embed
into refcounting subproject : reference is already dropped by os_cleanup
_DELETE(ov);
}
@@ -583,7 +583,7 @@ os_cleanup(sqlstore* store, objectversio
}
assert(os_atmc_get_state(ov) != deleted && os_atmc_get_state(ov) !=
under_destruction && os_atmc_get_state(ov) != rollbacked);
- if (ov->os->temporary) os_destroy(ov->os, store); // TODO tempscs2os :
embed into refcounting subproject: (old) live versions should drop their
reference to the os
+ if (ov->os->temporary) os_destroy(ov->os, store); // TODO
transaction_layer_revam: embed into refcounting subproject: (old) live versions
should drop their reference to the os
while (ov->id_based_older && ov->id_based_older == ov->name_based_older
&& ov->ts >= oldest) {
ov = ov->id_based_older;
@@ -895,7 +895,7 @@ os_add_(objectset *os, struct sql_trans
return res;
}
- if (os->temporary) (void) os_dup(os); // TODO tempscs2os : embed into
refcounting subproject
+ if (os->temporary) (void) os_dup(os); // TODO transaction_layer_revam:
embed into refcounting subproject
trans_add(tr, b, ov, &tc_gc_objectversion, &tc_commit_objectversion,
NULL);
return res;
}
@@ -998,7 +998,7 @@ os_del_(objectset *os, struct sql_trans
return res;
}
- if (os->temporary) (void) os_dup(os); // TODO tempscs2os : embed into
refcounting subproject
+ if (os->temporary) (void) os_dup(os); // TODO transaction_layer_revam:
embed into refcounting subproject
trans_add(tr, b, ov, &tc_gc_objectversion, &tc_commit_objectversion,
NULL);
return res;
}
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -3591,7 +3591,7 @@ sql_trans_rollback(sql_trans *tr, bool c
for(sql_base *b = oi_next(&oi); b; b = oi_next(&oi)) {
sql_table *t = (sql_table *) b;
if (t->commit_action == CA_DROP && !b->deleted) {
- (void) sql_trans_drop_table_id(tr, t->s, b->id,
DROP_RESTRICT);// TODO tempscs2os : fix result code sql_trans_drop_table_id
+ (void) sql_trans_drop_table_id(tr, t->s, b->id,
DROP_RESTRICT);// TODO transaction_layer_revam: fix result code
sql_trans_drop_table_id
}
}
/* revert the change list */
@@ -3729,7 +3729,7 @@ schema_dup(sql_trans *tr, sql_schema *s,
ns->system = s->system;
sqlstore *store = tr->store;
- assert(!isTempSchema(s)); // TODO tempscs2os : check if this is really
true
+ assert(!isTempSchema(s)); // TODO transaction_layer_revam: check if
this is really true
ns->tables = os_new(tr->sa, (destroy_fptr) &table_destroy, false, true,
true, store);
ns->seqs = os_new(tr->sa, (destroy_fptr) &seq_destroy, false, true,
true, store);
ns->keys = os_new(tr->sa, (destroy_fptr) &key_destroy, false, true,
true, store);
@@ -3874,7 +3874,7 @@ sql_trans_commit(sql_trans *tr)
for(sql_base *b = oi_next(&oi); b; b = oi_next(&oi)) {
sql_table *t = (sql_table *) b;
if (t->commit_action == CA_DROP && !b->deleted) {
- (void) sql_trans_drop_table_id(tr, t->s, b->id,
DROP_RESTRICT);;// TODO tempscs2os : fix result code sql_trans_drop_table_id
+ (void) sql_trans_drop_table_id(tr, t->s, b->id,
DROP_RESTRICT);;// TODO transaction_layer_revam: fix result code
sql_trans_drop_table_id
}
}
@@ -5037,7 +5037,7 @@ sql_trans_create_schema(sql_trans *tr, c
s->auth_id = auth_id;
s->owner = owner;
s->system = FALSE;
- assert(!isTempSchema(s)); // TODO tempscs2os : check if this is really
true
+ assert(!isTempSchema(s)); // TODO transaction_layer_revam: check if
this is really true
s->tables = os_new(tr->sa, (destroy_fptr) &table_destroy, false, true,
true, store);
s->types = os_new(tr->sa, (destroy_fptr) &type_destroy, false, true,
true, store);
s->funcs = os_new(tr->sa, (destroy_fptr) &func_destroy, false, false,
false, store);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
