hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1081: Fix VARCHAR field processing

Browse Source 
The data length is stored in the field metadata instead of the data being
encoded as a length encoded string.
This commit is contained in:
Markus Mäkelä
2017-03-02 13:14:07 +02:00
parent e01a6a0d58
commit e2869052bd
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/modules/routing/avro/avro_rbr.c
View File

@ -572,10 +572,22 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
else if (column_is_variable_string(map->column_types[i])) else if (column_is_variable_string(map->column_types[i]))
{ {
size_t sz; size_t sz;
char *str = lestr_consume(&ptr, &sz); int bytes = metadata[metadata_offset] | metadata[metadata_offset + 1] << 8;
if (bytes > 255)
{
sz = gw_mysql_get_byte2(ptr);
ptr += 2;
}
else
{
sz = *ptr;
ptr++;
}
char buf[sz + 1]; char buf[sz + 1];
memcpy(buf, str, sz); memcpy(buf, ptr, sz);
buf[sz] = '\0'; buf[sz] = '\0';
ptr += sz;
avro_value_set_string(&field, buf); avro_value_set_string(&field, buf);
ss_dassert(ptr < end); ss_dassert(ptr < end);
} }