Changeset: fd92a3abab58 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd92a3abab58
Modified Files:
gdk/gdk_batop.c
Branch: Jun2016
Log Message:
Backed out changeset 2c74d71e840e
Apparently this was not so bad after all.
diffs (21 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -413,7 +413,7 @@ BATappend(BAT *b, BAT *n, bit force)
IMPSdestroy(b); /* imprints do not support updates yet */
/* append two void,void bats */
- if (b->ttype == TYPE_void && BATtdense(n)) {
+ if (b->ttype == TYPE_void && BATtdense(b)) {
oid f = n->tseqbase;
if (n->ttype != TYPE_void)
@@ -421,7 +421,7 @@ BATappend(BAT *b, BAT *n, bit force)
if (BATcount(b) == 0 && f != oid_nil)
BATseqbase(BATmirror(b), f);
- if (BATcount(b) + b->tseqbase == f) {
+ if (BATtdense(n) && BATcount(b) + b->tseqbase == f) {
sz += BATcount(b);
BATsetcount(b, sz);
return GDK_SUCCEED;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
