Changeset: bef75eaae6cd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bef75eaae6cd
Modified Files:
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_private.h
gdk/gdk_storage.c
Branch: default
Log Message:
BBPcacheit cannot fail, so turn into void function.
diffs (86 lines):
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -202,16 +202,7 @@ VIEWcreate(oid seq, BAT *b, BUN l, BUN h
VIEWboundsbi(&bi, bn, l, h);
MT_lock_unset(&b->theaplock);
- if (BBPcacheit(bn, true) != GDK_SUCCEED) { /* enter in BBP */
- if (bn->tvheap)
- HEAPdecref(bn->tvheap, false);
- HEAPdecref(bn->theap, false);
- MT_lock_destroy(&bn->theaplock);
- MT_lock_destroy(&bn->batIdxLock);
- MT_rwlock_destroy(&bn->thashlock);
- GDKfree(bn);
- return NULL;
- }
+ BBPcacheit(bn, true);
BBPretain(bn->theap->parentid);
if (bn->tvheap)
BBPretain(bn->tvheap->parentid);
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -276,10 +276,7 @@ COLnew2(oid hseq, int tt, BUN cap, role_
HEAPfree(bn->theap, true);
goto bailout;
}
- if (BBPcacheit(bn, true) != GDK_SUCCEED) {
- /* cannot happen, function always returns success */
- goto bailout;
- }
+ BBPcacheit(bn, true);
TRC_DEBUG(ALGO, "-> " ALGOBATFMT "\n", ALGOBATPAR(bn));
return bn;
bailout:
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2590,7 +2590,7 @@ BBPallocbat(int tt)
return i;
}
-gdk_return
+void
BBPcacheit(BAT *bn, bool lock)
{
bat i = bn->batCacheid;
@@ -2610,7 +2610,6 @@ BBPcacheit(BAT *bn, bool lock)
if (lock)
MT_lock_unset(&GDKswapLock(i));
- return GDK_SUCCEED;
}
/*
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -79,8 +79,7 @@ gdk_return BATsave_iter(BAT *bd, BATiter
__attribute__((__visibility__("hidden")));
void BATsetdims(BAT *b, uint16_t width)
__attribute__((__visibility__("hidden")));
-gdk_return BBPcacheit(BAT *bn, bool lock)
- __attribute__((__warn_unused_result__))
+void BBPcacheit(BAT *bn, bool lock)
__attribute__((__visibility__("hidden")));
gdk_return BBPchkfarms(void)
__attribute__((__warn_unused_result__))
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -840,12 +840,7 @@ BATload_intern(bat bid, bool lock)
b->theap->parentid = b->batCacheid;
/* load succeeded; register it in BBP */
- if (BBPcacheit(b, lock) != GDK_SUCCEED) {
- HEAPfree(b->theap, false);
- if (b->tvheap)
- HEAPfree(b->tvheap, false);
- return NULL;
- }
+ BBPcacheit(b, lock);
return b;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
