Changeset: 5f83bc4e2e7b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5f83bc4e2e7b
Modified Files:
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_hash.c
gdk/gdk_imprints.c
gdk/gdk_orderidx.c
gdk/gdk_storage.c
Branch: Jul2021
Log Message:
Remove assertions that the batCacheid is non-negative.
This is a remnant from when we went "headless".
diffs (144 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2148,9 +2148,8 @@ gdk_export void VIEWbounds(BAT *b, BAT *
* correct for the reversed view.
*/
#define isVIEW(x) \
- (assert((x)->batCacheid > 0), \
- (((x)->theap && (x)->theap->parentid != (x)->batCacheid) || \
- ((x)->tvheap && (x)->tvheap->parentid != (x)->batCacheid)))
+ (((x)->theap && (x)->theap->parentid != (x)->batCacheid) || \
+ ((x)->tvheap && (x)->tvheap->parentid != (x)->batCacheid))
#define VIEWtparent(x) ((x)->theap == NULL || (x)->theap->parentid ==
(x)->batCacheid ? 0 : (x)->theap->parentid)
#define VIEWvtparent(x) ((x)->tvheap == NULL || (x)->tvheap->parentid
== (x)->batCacheid ? 0 : (x)->tvheap->parentid)
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -278,7 +278,6 @@ VIEWunlink(BAT *b)
BAT *tpb = NULL;
BAT *vtpb = NULL;
- assert(b->batCacheid > 0);
if (tp)
tpb = BBP_cache(tp);
if (tp && !vtp)
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -112,8 +112,6 @@ BATcreatedesc(oid hseq, int tt, bool hea
* fill in heap names, so HEAPallocs can resort to disk for
* very large writes.
*/
- assert(bn->batCacheid > 0);
-
if (heapnames) {
assert(bn->theap != NULL);
*bn->theap = (Heap) {
@@ -657,7 +655,6 @@ BATfree(BAT *b)
return;
/* deallocate all memory for a bat */
- assert(b->batCacheid > 0);
if (b->tident && !default_ident(b->tident))
GDKfree(b->tident);
b->tident = BATstring_t;
@@ -1910,7 +1907,6 @@ gdk_return
BATkey(BAT *b, bool flag)
{
BATcheck(b, GDK_FAIL);
- assert(b->batCacheid > 0);
if (b->ttype == TYPE_void) {
if (BATtdense(b) && !flag) {
GDKerror("dense column must be unique.\n");
@@ -1951,7 +1947,6 @@ BAThseqbase(BAT *b, oid o)
if (b != NULL) {
assert(o <= GDK_oid_max); /* i.e., not oid_nil */
assert(o + BATcount(b) <= GDK_oid_max);
- assert(b->batCacheid > 0);
if (b->hseqbase != o) {
b->batDirtydesc = true;
b->hseqbase = o;
@@ -1966,7 +1961,6 @@ BATtseqbase(BAT *b, oid o)
if (b == NULL)
return;
assert(is_oid_nil(o) || o + BATcount(b) <= GDK_oid_max);
- assert(b->batCacheid > 0);
if (b->tseqbase != o) {
b->batDirtydesc = true;
}
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -21,7 +21,6 @@
gdk_return
unshare_varsized_heap(BAT *b)
{
- assert(b->batCacheid > 0);
if (ATOMvarsized(b->ttype) &&
b->tvheap->parentid != b->batCacheid) {
Heap *h = GDKzalloc(sizeof(Heap));
@@ -651,7 +650,6 @@ BATappend2(BAT *b, BAT *n, BAT *s, bool
if (b == NULL || n == NULL || BATcount(n) == 0) {
return GDK_SUCCEED;
}
- assert(b->batCacheid > 0);
assert(b->theap->parentid == b->batCacheid);
TRC_DEBUG_IF(ALGO) {
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1991,7 +1991,6 @@ BBPcacheit(BAT *bn, bool lock)
if (bn->tvheap)
bn->tvheap->parentid = i;
}
- assert(bn->batCacheid > 0);
if (lock)
MT_lock_set(&GDKswapLock(i));
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -998,7 +998,6 @@ BAThash_impl(BAT *restrict b, struct can
gdk_return
BAThash(BAT *b)
{
- assert(b->batCacheid > 0);
if (ATOMstorage(b->ttype) == TYPE_msk) {
GDKerror("No hash on msk type bats\n");
return GDK_FAIL;
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -775,7 +775,6 @@ IMPSfree(BAT *b)
Imprints *imprints;
if (b && b->timprints) {
- assert(b->batCacheid > 0);
MT_lock_set(&b->batIdxLock);
imprints = b->timprints;
if (imprints != NULL && imprints != (Imprints *) 1) {
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -76,7 +76,6 @@ BATcheckorderidx(BAT *b)
if (b == NULL)
return false;
- assert(b->batCacheid > 0);
/* we don't need the lock just to read the value b->torderidx */
if (b->torderidx == (Heap *) 1) {
/* but when we want to change it, we need the lock */
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -789,7 +789,6 @@ BATsave_locked(BAT *b, BATiter *bi, BUN
dosync = (BBP_status(b->batCacheid) & BBPPERSISTENT) != 0;
assert(!GDKinmemory(b->theap->farmid));
- assert(b->batCacheid > 0);
/* views cannot be saved, but make an exception for
* force-remapped views */
if (isVIEW(b)) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
