MonetDB: bwd - * fixed the build (sorry)

[Holger Pirk]

Changeset: e1a5e9e9f53d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e1a5e9e9f53d
Modified Files:
        monetdb5/extras/bwd/operations.c
        monetdb5/extras/bwd/utilities.c
Branch: bwd
Log Message:

* fixed the build (sorry)
* propagating varheaps in leftjoin (I think so, at least)


Unterschiede (36 Zeilen):

diff --git a/monetdb5/extras/bwd/operations.c b/monetdb5/extras/bwd/operations.c
--- a/monetdb5/extras/bwd/operations.c
+++ b/monetdb5/extras/bwd/operations.c
@@ -438,12 +438,18 @@ str BWDLeftJoinRefine(bat * res, bat * l
                        GDKfree(supersetApproximateValuesColumn);
 
                        if(!BAThvoid(left)){ // propagate left head column
-                               /* BATseqbase(refinement, oid_nil); */
                                BATseqbase(BATmirror(refinement), oid_nil);
                                refinement = VIEWcreate(BATmark(left, 
oid_nil),refinement);
-                       
-                               /* refinement = 
VIEWcreate(VIEWhead(left),refinement); */
                        }
+
+                       if(BATttype(right) == TYPE_str){ // propagate right heap
+                               if (right->batRestricted == BAT_READ) {
+                                       assert(right->T->vheap->parentid > 0);
+                                       BBPshare(right->T->vheap->parentid);
+                                       refinement->T->vheap = right->T->vheap;
+                               }
+                       }
+
                }
 
                BBPkeepref(*res = refinement->batCacheid);
diff --git a/monetdb5/extras/bwd/utilities.c b/monetdb5/extras/bwd/utilities.c
--- a/monetdb5/extras/bwd/utilities.c
+++ b/monetdb5/extras/bwd/utilities.c
@@ -481,7 +481,6 @@ unsigned int decomposeVarchar1Array(cons
 
        for (i = 0; i < size; ++i) {
                const int value = subject[i];
-               bla[value] = 1;
                { // approximation
                        const size_t slotI = (i*approximationBits)/32;
                        const unsigned int offset = (i*approximationBits)%32;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list