MonetDB: Jul2021 - Extend changeset 8406b1944f75 to BATjoin.

[Sjoerd Mullender]

Changeset: 8cda6baeccc9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8cda6baeccc9
Modified Files:
        gdk/gdk_join.c
Branch: Jul2021
Log Message:

Extend changeset 8406b1944f75 to BATjoin.


diffs (21 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -3931,13 +3931,15 @@ BATjoin(BAT **r1p, BAT **r2p, BAT *l, BA
        if ((parent = VIEWtparent(l)) != 0) {
                BAT *b = BBPdescriptor(parent);
                if (l->hseqbase == b->hseqbase &&
-                   BATcount(l) == BATcount(b))
+                   BATcount(l) == BATcount(b) &&
+                   ATOMtype(l->ttype) == ATOMtype(b->ttype))
                        l = b;
        }
        if ((parent = VIEWtparent(r)) != 0) {
                BAT *b = BBPdescriptor(parent);
                if (r->hseqbase == b->hseqbase &&
-                   BATcount(r) == BATcount(b))
+                   BATcount(r) == BATcount(b) &&
+                   ATOMtype(r->ttype) == ATOMtype(b->ttype))
                        r = b;
        }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list