MonetDB: Jul2015 - When resetting a view, also do that when only...

[Sjoerd Mullender]

Changeset: 93ef82367cca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93ef82367cca
Modified Files:
        gdk/gdk_align.c
Branch: Jul2015
Log Message:

When resetting a view, also do that when only the varheap is shared.
Part two of two of the fix for bug 3848.


diffs (23 lines):

diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -565,7 +565,7 @@ VIEWreset(BAT *b)
        tp = VIEWtparent(b);
        hvp = VIEWvhparent(b);
        tvp = VIEWvtparent(b);
-       if (hp || tp) {
+       if (hp || tp || hvp || tvp) {
                BAT *m;
                BATstore *bs;
                BUN cnt;
@@ -588,8 +588,8 @@ VIEWreset(BAT *b)
                nmelen = nme ? strlen(nme) : 0;
 
                assert(n->batCacheid > 0);
-               assert(hp || !b->htype);
-               assert(tp || !b->ttype);
+               assert(hp || hvp || !b->htype);
+               assert(tp || tvp || !b->ttype);
 
                head.farmid = BBPselectfarm(n->batRole, n->htype, offheap);
                tail.farmid = BBPselectfarm(n->batRole, n->ttype, offheap);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list