Changeset: 1f5498568a24 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f5498568a24
Modified Files:
gdk/gdk_batop.c
Branch: Dec2016
Log Message:
When appending to a double-eliminated string bat, insert string individually.
diffs (19 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -275,10 +275,13 @@ insert_string_bat(BAT *b, BAT *n, int fo
}
bunfastapp(b, tp);
}
- } else if (b->tvheap->free < n->tvheap->free / 2) {
+ } else if (b->tvheap->free < n->tvheap->free / 2 ||
+ GDK_ELIMDOUBLES(b->tvheap)) {
/* if b's string heap is much smaller than n's string
* heap, don't bother checking whether n's string
- * values occur in b's string heap */
+ * values occur in b's string heap; also, if b is
+ * (still) fully double eliminated, we must continue
+ * to use the double elimination mechanism */
BATloop(n, p, q) {
bunfastapp(b, BUNtvar(ni, p));
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
