MonetDB: default - merged

[Niels Nes]

Changeset: 838b6359c17b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=838b6359c17b
Branch: default
Log Message:

merged


diffs (20 lines):

diff --git a/sql/storage/objectset.c b/sql/storage/objectset.c
--- a/sql/storage/objectset.c
+++ b/sql/storage/objectset.c
@@ -391,14 +391,14 @@ try_to_mark_deleted_for_destruction(sqls
        if (ov->state == deleted) {
                ov->state = under_destruction;
 
-               if (!ov->name_based_newer || 
(os_atmc_get_state(ov->name_based_newer) & rollbacked)) {
+               if (!ov->name_based_newer || 
(os_atmc_get_state(ov->name_based_newer) & rollbacked)) { // TODO: This gives 
race conditions with os_rollback.
                        os_remove_name_based_chain(ov->os, store, 
ov->name_based_head);
                }
                else {
                        ov->name_based_newer->name_based_older = NULL;
                }
 
-               if (!ov->id_based_newer || 
(os_atmc_get_state(ov->id_based_newer) & rollbacked)) {
+               if (!ov->id_based_newer || 
(os_atmc_get_state(ov->id_based_newer) & rollbacked)) { // TODO: This gives 
race conditions with os_rollback.
                        os_remove_id_based_chain(ov->os, store, 
ov->id_based_head);
                }
                else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list