MonetDB: extract_types - Merge with default.

[Lucas Pereira]

Changeset: 7a59bd2a67ff for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7a59bd2a67ff
Branch: extract_types
Log Message:

Merge with default.


diffs (23 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -145,8 +145,8 @@ static ATOMIC_TYPE BBPtransid = ATOMIC_V
        (!VIEWtparent(b) && (ATOMIC_GET(&(b)->theap->refs) & HEAPREFS) == 1)
 
 #define BATshared(b) \
-       ((!VIEWtparent(b) && ((ATOMIC_GET(&(b)->theap->refs) & HEAPREFS) > 1)) 
|| \
-        ((b)->tvheap && (!VIEWvtparent(b) && (ATOMIC_GET(&(b)->tvheap->refs) & 
HEAPREFS) > 1)))
+       ((!VIEWtparent(b) && (ATOMIC_GET(&(b)->theap->refs) & HEAPREFS) > 1) || 
\
+        ((b)->tvheap && !VIEWvtparent(b) && (ATOMIC_GET(&(b)->tvheap->refs) & 
HEAPREFS) > 1))
 
 static void
 BBP_insert(bat i)
@@ -2850,7 +2850,7 @@ decref(bat i, bool logical, bool lock, c
                }
                /* cannot release last logical ref if still shared */
                // but we could still have a bat iterator on it
-               //assert(BATnot_shared(BBP_desc(i)) || refs > 0);
+               //assert(!BATshared(BBP_desc(i)) || refs > 0);
        } else {
                if (BBP_refs(i) == 0) {
                        GDKerror("%s: %s does not have pointer fixes.\n", func, 
BBP_logical(i));
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org