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

Merge branch 'develop' into MXS-1266

Browse Source
This commit is contained in:
MassimilianoPinto
2017-05-29 10:36:54 +02:00
parent ea82e6632d 90961f585c
commit a6e4ff1c10
90 changed files with 399 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,12 +211,40 @@ bool json_extract_field_names(const char* filename, TABLE_CREATE *table)
}
json_t *name = json_object_get(val, "name");
if (name && json_is_string(name))
{
const char *name_str = json_string_value(name);
if (not_generated_field(name_str))
{
table->column_names[columns++] = MXS_STRDUP_A(name_str);
table->column_names[columns] = MXS_STRDUP_A(name_str);
json_t* value;
if ((value = json_object_get(val, "real_type")) && json_is_string(value))
{
table->column_types[columns] = MXS_STRDUP_A(json_string_value(value));
}
else
{
table->column_types[columns] = MXS_STRDUP_A("unknown");
MXS_WARNING("No \"real_type\" value defined. "
"Treating as unknown type field.");
}
if ((value = json_object_get(val, "length")) && json_is_integer(value))
{
table->column_lengths[columns] = json_integer_value(value);
}
else
{
table->column_lengths[columns] = -1;
MXS_WARNING("No \"length\" value defined. "
"Treating as default length field.");
}
columns++;
}
}
else