MonetDB: unlock - Set count before growing heap so that the data...

[Sjoerd Mullender]

Changeset: d8d6c399dac4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8d6c399dac4
Modified Files:
        gdk/gdk_cand.c
Branch: unlock
Log Message:

Set count before growing heap so that the data gets copied.


diffs (27 lines):

diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -1306,6 +1306,7 @@ BATunmask(BAT *b)
                for (uint32_t i = 0; i < 32; i++) {
                        if (val & (1U << i)) {
                                if (n == BATcapacity(bn)) {
+                                       BATsetcount(bn, n);
                                        if (BATextend(bn, BATgrows(bn)) != 
GDK_SUCCEED) {
                                                BBPreclaim(bn);
                                                return NULL;
@@ -1321,6 +1322,7 @@ BATunmask(BAT *b)
                for (uint32_t i = 0; i < rem; i++) {
                        if (val & (1U << i)) {
                                if (n == BATcapacity(bn)) {
+                                       BATsetcount(bn, n);
                                        if (BATextend(bn, BATgrows(bn)) != 
GDK_SUCCEED) {
                                                BBPreclaim(bn);
                                                return NULL;
@@ -1332,7 +1334,6 @@ BATunmask(BAT *b)
                }
        }
        BATsetcount(bn, n);
-       bn->tseqbase = oid_nil;
        bn->tkey = true;
        bn->tsorted = true;
        bn->trevsorted = n <= 1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list