Changeset: 8a709fd58db8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a709fd58db8
Modified Files:
gdk/gdk_batop.c
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (45 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -420,7 +420,7 @@ BATappend(BAT *b, BAT *n, bit force)
OIDXdestroy(b);
/* append two void,void bats */
- if (b->ttype == TYPE_void && BATtdense(b)) {
+ if (b->ttype == TYPE_void && BATtdense(n)) {
oid f = n->tseqbase;
if (n->ttype != TYPE_void)
@@ -428,7 +428,7 @@ BATappend(BAT *b, BAT *n, bit force)
if (BATcount(b) == 0 && f != oid_nil)
BATtseqbase(b, f);
- if (BATtdense(n) && BATcount(b) + b->tseqbase == f) {
+ if (BATcount(b) + b->tseqbase == f) {
sz += BATcount(b);
BATsetcount(b, sz);
if (b->tunique)
@@ -443,6 +443,11 @@ BATappend(BAT *b, BAT *n, bit force)
}
}
+ if (b->thash == (Hash *) 1) {
+ /* don't bother first loading the hash to then
+ * change it */
+ HASHdestroy(b);
+ }
/* if growing too much, remove the hash, else we maintain it */
if (BATcheckhash(b) && (2 * b->thash->mask) < (BATcount(b) + sz)) {
HASHdestroy(b);
@@ -538,11 +543,6 @@ BATappend(BAT *b, BAT *n, bit force)
return GDK_FAIL;
}
- if (b->thash == (Hash *) 1) {
- /* don't bother first loading the hash to then
- * change it */
- HASHdestroy(b);
- }
BATloop(n, p, q) {
const void *t = BUNtail(ni, p);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
