Changeset: c2f23b27baf7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c2f23b27baf7
Modified Files:
gdk/gdk_bat.c
gdk/gdk_calc.c
Branch: default
Log Message:
Merge with Nov2019 branch.
diffs (23 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -682,7 +682,7 @@ COLcopy(BAT *b, int tt, bool writable, r
if (tt != bn->ttype) {
bn->ttype = tt;
bn->tvarsized = ATOMvarsized(tt);
- bn->tseqbase = b->tseqbase;
+ bn->tseqbase = ATOMtype(tt) == TYPE_oid ? b->tseqbase :
oid_nil;
}
} else {
/* check whether we need case (4); BUN-by-BUN copy (by
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -14219,6 +14219,7 @@ BATconvert(BAT *b, BAT *s, int tp, bool
if (cnt == ncand && tp != TYPE_bit &&
ATOMbasetype(b->ttype) == ATOMbasetype(tp) &&
+ (tp != TYPE_oid || b->ttype == TYPE_oid) &&
(tp != TYPE_str ||
BATatoms[b->ttype].atomToStr == BATatoms[TYPE_str].atomToStr)) {
return COLcopy(b, tp, false, TRANSIENT);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
