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

Fix DECIMAL handling in Avrorouter

Browse Source 
The DECIMAL value type is now properly handled in Avrorouter. It is
processed into an Avro double value when before it was ignored and
replaced with a zero integer.
This commit is contained in:
Markus Mäkelä
2016-12-17 12:15:16 +02:00
parent 488a9d24e3
commit 269a97b2de
4 changed files with 94 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -539,26 +539,9 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
}
else if (column_is_decimal(map->column_types[i]))
{
const int dec_dig = 9;
int precision = metadata[metadata_offset];
int decimals = metadata[metadata_offset + 1];
int dig_bytes[] = {0, 1, 1, 2, 2, 3, 3, 4, 4, 4};
int ipart = precision - decimals;
int ipart1 = ipart / dec_dig;
int fpart1 = decimals / dec_dig;
int ipart2 = ipart - ipart1 * dec_dig;
int fpart2 = decimals - fpart1 * dec_dig;
int ibytes = ipart1 * 4 + dig_bytes[ipart2];
int fbytes = fpart1 * 4 + dig_bytes[fpart2];
ptr += ibytes + fbytes;
// TODO: Add support for DECIMAL
if (!warn_decimal)
{
warn_decimal = true;
MXS_WARNING("DECIMAL is not currently supported, values are stored as 0.");
}
avro_value_set_int(&field, 0);
double f_value = 0.0;
ptr += unpack_decimal_field(ptr, metadata + metadata_offset, &f_value);
avro_value_set_double(&field, f_value);
}
else if (column_is_variable_string(map->column_types[i]))
{

2
server/modules/routing/avrorouter/avro_schema.c
View File

@ -44,7 +44,6 @@ static const char* column_type_to_avro_type(uint8_t type)
{
switch (type)
{
case TABLE_COL_TYPE_NEWDECIMAL:
case TABLE_COL_TYPE_TINY:
case TABLE_COL_TYPE_SHORT:
case TABLE_COL_TYPE_LONG:
@ -56,6 +55,7 @@ static const char* column_type_to_avro_type(uint8_t type)
return "float";
case TABLE_COL_TYPE_DOUBLE:
case TABLE_COL_TYPE_NEWDECIMAL:
return "double";
case TABLE_COL_TYPE_NULL: