MonetDB: default - Headless and BATmark clean up

[Martin Kersten]

Changeset: 3bceae749ebd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3bceae749ebd
Modified Files:
        gdk/gdk_bat.c
        monetdb5/modules/kernel/algebra.c
Branch: default
Log Message:

Headless and BATmark clean up
The head is always dense in the new situation.


diffs (66 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -77,6 +77,7 @@ BATcreatedesc(int ht, int tt, int heapna
         */
        assert(ht >= 0 && tt >= 0);
        assert(role >= 0 && role < 32);
+       //assert(ht == TYPE_void);
 
        bs = (BATstore *) GDKzalloc(sizeof(BATstore));
 
diff --git a/monetdb5/modules/kernel/algebra.c 
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -1002,7 +1002,7 @@ ALGantijoin2( bat *l, bat *r, const bat 
 str
 ALGjoin2( bat *l, bat *r, const bat *left, const bat *right)
 {
-       BAT *L, *R, *j1, *j2, *lmap, *rmap;
+       BAT *L, *R, *j1, *j2;
        gdk_return ret;
 
        if ((L = BATdescriptor(*left)) == NULL) {
@@ -1013,41 +1013,11 @@ ALGjoin2( bat *l, bat *r, const bat *lef
                throw(MAL, "algebra.join", RUNTIME_OBJECT_MISSING);
        }
 
-       if (!BAThdense(L) || !BAThdense(R)) {
-               lmap = BATmirror(BATmark(L, 0));
-               j1 = BATmirror(BATmark(BATmirror(L), 0));
-               BBPunfix(L->batCacheid);
-               L = j1;
-               rmap = BATmirror(BATmark(R, 0));
-               j2 = BATmirror(BATmark(BATmirror(R), 0));
-               BBPunfix(R->batCacheid);
-               R = j2;
-       } else {
-               lmap = NULL;
-               rmap = NULL;
-       }
        ret = BATsubjoin(&j1, &j2, L, R, NULL, NULL, 0, BUN_NONE);
        BBPunfix(L->batCacheid);
        BBPunfix(R->batCacheid);
-       if (ret != GDK_SUCCEED) {
-               if (lmap)
-                       BBPunfix(lmap->batCacheid);
-               if (rmap)
-                       BBPunfix(rmap->batCacheid);
+       if (ret != GDK_SUCCEED) 
                throw(MAL, "algebra.join", GDK_EXCEPTION);
-       }
-       if (lmap) {
-               L = BATproject(j1, lmap);
-               BBPunfix(j1->batCacheid);
-               BBPunfix(lmap->batCacheid);
-               j1 = L;
-               lmap = NULL;
-               R = BATproject(j2, rmap);
-               BBPunfix(j2->batCacheid);
-               BBPunfix(rmap->batCacheid);
-               j2 = R;
-               rmap = NULL;
-       }
        if (!(j1->batDirty&2))
                BATsetaccess(j1, BAT_READ);
        if (!(j2->batDirty&2))
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list