Changeset: a547176c7f0e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a547176c7f0e
Modified Files:
gdk/gdk_atoms.c
gdk/gdk_bat.c
Branch: Jun2016
Log Message:
Merge with Jul2015 branch.
diffs (30 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -1068,6 +1068,7 @@ strHeap(Heap *d, size_t cap)
size = GDK_STRHASHTABLE * sizeof(stridx_t) + MIN(GDK_ELIMLIMIT, cap *
GDK_VARALIGN);
if (HEAPalloc(d, size, 1) == GDK_SUCCEED) {
d->free = GDK_STRHASHTABLE * sizeof(stridx_t);
+ d->dirty = 1;
memset(d->base, 0, d->free);
d->hashash = 1; /* new string heaps get the hash value (and
length) stored */
#ifndef NDEBUG
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -780,6 +780,7 @@ COLcopy(BAT *b, int tt, int writable, in
bn->H->heap.free = 0;
bn->T->heap.free = bunstocopy * sizeof(oid);
+ bn->T->heap.dirty |= bunstocopy > 0;
while (bunstocopy--) {
*dst++ = cur;
cur += inc;
@@ -790,6 +791,7 @@ COLcopy(BAT *b, int tt, int writable, in
bn->H->heap.free = 0;
bn->T->heap.free = bunstocopy * Tsize(bn);
+ bn->T->heap.dirty |= bunstocopy > 0;
memcpy(Tloc(bn, 0), Tloc(b, p), bn->T->heap.free);
}
/* copy all properties (size+other) from the source bat */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
