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

MXS-1575: Add extra debug assertions

Browse Source 
Added more debug assertions to JSON serialization of the Avro schema. Also
checked that the column count for the TABLE_CREATE object matches that of
the TABLE_MAP object.
This commit is contained in:
Markus Mäkelä
2018-01-02 14:07:51 +02:00
parent 5c624f9dda
commit a86b81824f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,10 +123,13 @@ char* json_new_schema_from_table(TABLE_MAP *map)
json_array_append_new(array, json_pack_ex(&err, 0, "{s:s, s:o}", "name", avro_event_type, json_array_append_new(array, json_pack_ex(&err, 0, "{s:s, s:o}", "name", avro_event_type,
"type", event_types)); "type", event_types));
for (uint64_t i = 0; i < map->columns; i++) for (uint64_t i = 0; i < map->columns && i < create->columns; i++)
{ {
ss_info_dassert(create->column_names[i] && *create->column_names[i], ss_info_dassert(create->column_names[i] && *create->column_names[i],
"Column name should not be empty or NULL"); "Column name should not be empty or NULL");
ss_info_dassert(create->column_types[i] && *create->column_types[i],
"Column type should not be empty or NULL");
json_array_append_new(array, json_pack_ex(&err, 0, "{s:s, s:s, s:s, s:i}", json_array_append_new(array, json_pack_ex(&err, 0, "{s:s, s:s, s:s, s:i}",
"name", create->column_names[i], "name", create->column_names[i],
"type", column_type_to_avro_type(map->column_types[i]), "type", column_type_to_avro_type(map->column_types[i]),