Changeset: 0fef1ef11ac5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0fef1ef11ac5
Modified Files:
gdk/gdk_calc.c
Branch: default
Log Message:
Some fixes.
diffs (36 lines):
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -13842,7 +13842,7 @@ convert_void_any(oid seq, BUN cnt, BAT *
((bte *) dst)[i] = 1;
}
} else {
- for (i = 0; i < end; i++, seq++) {
+ for (i = start; i < end; i++, seq++) {
CHECKCAND((bte *) dst, i, candoff,
bte_nil);
((bte *) dst)[i] = (bte) seq;
@@ -13896,7 +13896,7 @@ convert_void_any(oid seq, BUN cnt, BAT *
case TYPE_str:
for (i = 0; i < start; i++)
tfastins_nocheckVAR(bn, i, str_nil, bn->twidth);
- for (i = 0; i < end; i++) {
+ for (; i < end; i++) {
if (cand) {
if (i < *cand - candoff) {
nils++;
@@ -13951,12 +13951,8 @@ convert_void_any(oid seq, BUN cnt, BAT *
((dbl *) dst)[i] = dbl_nil;
break;
case TYPE_str:
- seq = oid_nil;
- if ((*atomtostr)(&s, &len, &seq) < 0)
- goto bunins_failed;
- for (; i < cnt; i++) {
- tfastins_nocheckVAR(bn, i, s, bn->twidth);
- }
+ for (; i < cnt; i++)
+ tfastins_nocheckVAR(bn, i, str_nil, bn->twidth);
break;
default:
return BUN_NONE + 1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
