Changeset: 88b66a23a62a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/88b66a23a62a
Branch: Jul2021
Log Message:
merged with jul2021_debug
diffs (59 lines):
diff --git a/sql/storage/objectset.c b/sql/storage/objectset.c
--- a/sql/storage/objectset.c
+++ b/sql/storage/objectset.c
@@ -766,6 +766,7 @@ os_add_name_based(objectset *os, struct
objectversion *co = name_based_node->ov;
objectversion *oo = get_valid_object_name(tr, co);
if (co != oo) { /* conflict ? */
+ TRC_WARNING(SQL_STORE, "%s" "if (co != oo) { /*
conflict ? */", __func__);
return -3;
}
@@ -780,6 +781,7 @@ os_add_name_based(objectset *os, struct
*/
ATOMIC_BASE_TYPE expected_deleted = deleted;
if (!ATOMIC_CAS(&oo->state, &expected_deleted,
block_destruction)) {
+ TRC_WARNING(SQL_STORE, "%s: " "if
(!ATOMIC_CAS(&oo->state, &expected_deleted, block_destruction)) { /*conflict
with cleaner or write-write conflict*/ ", __func__);
return -3; /*conflict with cleaner or
write-write conflict*/
}
}
@@ -816,6 +818,7 @@ os_add_id_based(objectset *os, struct sq
objectversion *co = id_based_node->ov;
objectversion *oo = get_valid_object_id(tr, co);
if (co != oo) { /* conflict ? */
+ TRC_WARNING(SQL_STORE, "%s" "if (co != oo) { /*
conflict ? */", __func__);
return -3;
}
@@ -830,6 +833,7 @@ os_add_id_based(objectset *os, struct sq
*/
ATOMIC_BASE_TYPE expected_deleted = deleted;
if (!ATOMIC_CAS(&oo->state, &expected_deleted,
block_destruction)) {
+ TRC_WARNING(SQL_STORE, "%s" "if
(!ATOMIC_CAS(&oo->state, &expected_deleted, block_destruction)) { /*conflict
with cleaner or write-write conflict*/", __func__);
return -3; /*conflict with cleaner or
write-write conflict*/
}
}
@@ -870,6 +874,7 @@ os_add_(objectset *os, struct sql_trans
if (os->destroy)
os->destroy(os->store, ov->b);
_DELETE(ov);
+ TRC_WARNING(SQL_STORE, "%s" "if (!os->concurrent &&
os_has_changes(os, tr)) { /* for object sets without concurrent support,
conflict if concurrent changes are there */", __func__);
return -3; /* conflict */
}
@@ -912,6 +917,7 @@ os_del_name_based(objectset *os, struct
objectversion *oo = get_valid_object_name(tr, co);
ov->name_based_head = oo->name_based_head;
if (co != oo) { /* conflict ? */
+ TRC_WARNING(SQL_STORE, "%s: " "if (co != oo) { /*
conflict ? */", __func__);
return -3;
}
ov->name_based_older = oo;
@@ -943,6 +949,7 @@ os_del_id_based(objectset *os, struct sq
objectversion *oo = get_valid_object_id(tr, co);
ov->id_based_head = oo->id_based_head;
if (co != oo) { /* conflict ? */
+ TRC_WARNING(SQL_STORE, "%s" "if (co != oo) { /*
conflict ? */", __func__);
return -3;
}
ov->id_based_older = oo;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
