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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2018-11-06 21:12:20 +02:00
parent c3c257719d a9041a74f1
commit 383b0b1989
16 changed files with 232 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/routing/avrorouter/avro_converter.cc
View File

@ -232,10 +232,11 @@ char* json_new_schema_from_table(const STableMapEvent& map, const STableCreateEv
json_array_append_new(array,
json_pack_ex(&err,
0,
"{s:s, s:s, s:s, s:i}",
"{s:s, s:[s, s], s:s, s:i}",
"name",
create->columns[i].name.c_str(),
"type",
"null",
column_type_to_avro_type(map->column_types[i]),
"real_type",
create->columns[i].type.c_str(),
@ -449,23 +450,16 @@ void AvroConverter::column(int i, uint8_t* value, int len)
void AvroConverter::column(int i)
{
set_active(i);
if (column_is_blob(m_map->column_types[i]))
{
uint8_t nullvalue = 0;
avro_value_set_bytes(&m_field, &nullvalue, 1);
}
else
{
avro_value_set_null(&m_field);
}
avro_value_set_branch(&m_union_value, 0, &m_field);
avro_value_set_null(&m_field);
}
void AvroConverter::set_active(int i)
{
MXB_AT_DEBUG(int rc = ) avro_value_get_by_name(&m_record,
m_create->columns[i].name.c_str(),
&m_field,
&m_union_value,
NULL);
mxb_assert(rc == 0);
avro_value_set_branch(&m_union_value, 1, &m_field);
}

1
server/modules/routing/avrorouter/avro_converter.hh
View File

@ -65,6 +65,7 @@ private:
avro_value_iface_t* m_writer_iface;
avro_file_writer_t* m_avro_file;
avro_value_t m_record;
avro_value_t m_union_value;
avro_value_t m_field;
std::string m_avrodir;
AvroTables m_open_tables;

3
server/modules/routing/avrorouter/avro_rbr.cc
View File

@ -264,7 +264,10 @@ uint8_t* process_row_event_data(STableMapEvent map,
{
if (bit_is_set(columns_present, ncolumns, i))
{
avro_value_t field;
avro_value_set_branch(&union_value, 1, &field);
npresent++;
if (bit_is_set(null_bitmap, ncolumns, i))
{
sprintf(trace[i], "[%ld] NULL", i);