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

Fix ENUM/SET string representation

Browse Source 
The value is now stored as a hexadecimal value instead of a decimal
value. This also lifts the enum size restriction on more than 8 values
(which was incorrectly documented as 255 values).
This commit is contained in:
Markus Mäkelä
2017-12-13 11:26:24 +02:00
parent bdcda0f235
commit 2f56757839
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/routing/avrorouter/avro_rbr.c
View File

@ -526,16 +526,8 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
{ {
uint8_t val[metadata[metadata_offset + 1]]; uint8_t val[metadata[metadata_offset + 1]];
uint64_t bytes = unpack_enum(ptr, &metadata[metadata_offset], val); uint64_t bytes = unpack_enum(ptr, &metadata[metadata_offset], val);
char strval[32]; char strval[bytes * 2 + 1];
gw_bin2hex(strval, val, bytes);
/** Right now only ENUMs/SETs with less than 256 values
* are printed correctly */
snprintf(strval, sizeof(strval), "%hhu", val[0]);
if (bytes > 1 && warn_large_enumset)
{
warn_large_enumset = true;
MXS_WARNING("ENUM/SET values larger than 255 values aren't supported.");
}
avro_value_set_string(&field, strval); avro_value_set_string(&field, strval);
MXS_INFO("[%ld] ENUM: %lu bytes", i, bytes); MXS_INFO("[%ld] ENUM: %lu bytes", i, bytes);
ptr += bytes; ptr += bytes;