Changeset: 5e66a6869455 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5e66a6869455
Modified Files:
gdk/gdk_bat.c
Branch: Jul2021
Log Message:
COLnew_intern doesn't allocate vheap when width is specified, so we do it.
diffs (21 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -830,6 +830,17 @@ COLcopy(BAT *b, int tt, bool writable, r
bat_iterator_end(&bi);
return NULL;
}
+ if (bn->tvheap != NULL && bn->tvheap->base == NULL) {
+ /* this combination can happen since the last
+ * argument of COLnew_intern not being zero
+ * triggers a skip in the allocation of the
+ * tvheap */
+ if (ATOMheap(bn->ttype, bn->tvheap, bn->batCapacity) !=
GDK_SUCCEED) {
+ bat_iterator_end(&bi);
+ BBPreclaim(bn);
+ return NULL;
+ }
+ }
if (tt == TYPE_void) {
/* case (2): a void,void result => nothing to
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
