MonetDB: resource_management - merge default

[svetlin via checkin-list]

Changeset: 09e7c70aa288 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/09e7c70aa288
Branch: resource_management
Log Message:

merge default


diffs (41 lines):

diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -302,17 +302,16 @@ bool
 BATcheckimprints(BAT *b)
 {
        bool ret;
-       BATiter bi = bat_iterator(b);
 
        if (VIEWtparent(b)) {
                assert(b->timprints == NULL);
                b = BATdescriptor(VIEWtparent(b));
                if (b == NULL) {
-                       bat_iterator_end(&bi);
                        return false;
                }
        }
 
+       BATiter bi = bat_iterator(b);
        MT_lock_set(&b->batIdxLock);
        if (b->timprints == (Imprints *) 1) {
                Imprints *imprints;
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -2335,6 +2335,7 @@ BATselect(BAT *b, BAT *s, const void *tl
                 */
                Imprints *imprints = NULL;
                if (!equi &&
+                   /* DISABLES CODE */ (0) &&
                    imprintable(bi.type) &&
                    (!bi.transient ||
                     (pb != NULL && !pbi.transient)) &&
@@ -2699,6 +2700,7 @@ rangejoin(BAT *r1, BAT *r2, BAT *l, BAT 
                cnt = BATcount(r1);
                assert(r2 == NULL || BATcount(r1) == BATcount(r2));
        } else if (!anti && !symmetric &&
+                  /* DISABLES CODE */ (0) &&
                   imprintable(li.type) &&
                   (BATcount(rl) > 2 ||
                    !li.transient ||
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org