Changeset: b15949749c5c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b15949749c5c
Modified Files:
gdk/gdk_batop.c
Branch: default
Log Message:
No need to temporarily change bat type.
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
@@ -256,32 +256,26 @@ insert_string_bat(BAT *b, BAT *n, struct
switch (b->twidth) {
case 1:
- b->ttype = TYPE_bte;
tp = &tbv;
break;
case 2:
- b->ttype = TYPE_sht;
tp = &tsv;
break;
#if SIZEOF_VAR_T == 8
case 4:
- b->ttype = TYPE_int;
tp = &tiv;
break;
case 8:
- b->ttype = TYPE_lng;
tp = &v;
break;
#else
case 4:
- b->ttype = TYPE_int;
tp = &v;
break;
#endif
default:
assert(0);
}
- b->tvarsized = false;
MT_thread_setalgorithm("copy offset values");
while (cnt > 0) {
cnt--;
@@ -329,8 +323,6 @@ insert_string_bat(BAT *b, BAT *n, struct
break;
}
}
- b->tvarsized = true;
- b->ttype = TYPE_str;
} 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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list