Changeset: eba84239e9ff for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eba84239e9ff
Modified Files:
gdk/gdk_join.c
gdk/gdk_select.c
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (63 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -474,6 +474,8 @@ nomatch(BAT *r1, BAT *r2, BAT *l, BAT *r
} else {
cnt = lend - lstart;
HEAPfree(&r1->theap, 1);
+ r1->theap.storage = r1->theap.newstorage = STORE_MEM;
+ r1->theap.size = 0;
r1->ttype = TYPE_void;
r1->tvarsized = 1;
r1->twidth = 0;
@@ -486,6 +488,8 @@ nomatch(BAT *r1, BAT *r2, BAT *l, BAT *r
r1->tnorevsorted = !(r1->trevsorted = BATcount(r1) <= 1);
if (r2) {
HEAPfree(&r2->theap, 1);
+ r2->theap.storage = r2->theap.newstorage = STORE_MEM;
+ r2->theap.size = 0;
r2->ttype = TYPE_void;
r2->tvarsized = 1;
r2->twidth = 0;
@@ -617,6 +621,9 @@ mergejoin_void(BAT *r1, BAT *r2, BAT *l,
* the result is the other
* range and thus dense */
HEAPfree(&r1->theap, 1);
+ r1->theap.storage = STORE_MEM;
+ r1->theap.newstorage = STORE_MEM;
+ r1->theap.size = 0;
r1->ttype = TYPE_void;
r1->tvarsized = 1;
r1->twidth = 0;
@@ -646,6 +653,9 @@ mergejoin_void(BAT *r1, BAT *r2, BAT *l,
}
r1->tdense = 1;
HEAPfree(&r1->theap, 1);
+ r1->theap.storage = STORE_MEM;
+ r1->theap.newstorage = STORE_MEM;
+ r1->theap.size = 0;
r1->ttype = TYPE_void;
r1->tvarsized = 1;
r1->twidth = 0;
@@ -690,6 +700,9 @@ mergejoin_void(BAT *r1, BAT *r2, BAT *l,
if (r2) {
r2->tdense = 1;
HEAPfree(&r2->theap, 1);
+ r2->theap.storage = STORE_MEM;
+ r2->theap.newstorage = STORE_MEM;
+ r2->theap.size = 0;
r2->ttype = TYPE_void;
r2->tvarsized = 1;
r2->twidth = 0;
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -59,6 +59,8 @@ virtualize(BAT *bn)
bn->tseqbase = * (const oid *) Tloc(bn, 0);
bn->tdense = 1;
HEAPfree(&bn->theap, 1);
+ bn->theap.storage = bn->theap.newstorage = STORE_MEM;
+ bn->theap.size = 0;
bn->ttype = TYPE_void;
bn->tvarsized = 1;
bn->twidth = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
