Changeset: 22cb1f817c4a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22cb1f817c4a
Modified Files:
gdk/gdk_batop.c
Branch: Feb2013
Log Message:
properly set the pointers based on the input bat not output bat.
diffs (40 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -74,7 +74,7 @@ insert_string_bat(BAT *b, BAT *n, int ap
unsigned char tbv, *tbp; /* tail value-as-bte */
unsigned short tsv, *tsp; /* tail value-as-sht */
#if SIZEOF_VAR_T == 8
- unsigned int tiv, *tip; /* tail value-as-int */
+ unsigned int tiv, *tip; /* tail value-as-int */
#endif
var_t v, *tvp; /* value */
int ntw, btw; /* shortcuts for {b,n}->t->width */
@@ -126,23 +126,23 @@ insert_string_bat(BAT *b, BAT *n, int ap
switch (btw) {
case 1:
tt = TYPE_bte;
- tbp = (unsigned char*)Tloc(n,BUNfirst(n));
break;
case 2:
tt = TYPE_sht;
- tsp = (unsigned short*)Tloc(n,BUNfirst(n));
break;
#if SIZEOF_VAR_T == 8
case 4:
tt = TYPE_int;
- tip = (unsigned int*)Tloc(n,BUNfirst(n));
break;
#endif
default:
tt = TYPE_var;
- tvp = (var_t*)Tloc(n,BUNfirst(n));
break;
}
+ tbp = (unsigned char*)Tloc(n,BUNfirst(n));
+ tsp = (unsigned short*)Tloc(n,BUNfirst(n));
+ tip = (unsigned int*)Tloc(n,BUNfirst(n));
+ tvp = (var_t*)Tloc(n,BUNfirst(n));
b->T->varsized = 0;
b->T->type = tt;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
