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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-05-10 09:28:39 +03:00
parent b4e8f79c5f 142038051c
commit 0d13e694e4
7 changed files with 76 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,7 +376,8 @@ bool notify_cb(DCB* dcb, void* data)
if (dcb->service == service && dcb->role == DCB::Role::CLIENT)
{
poll_fake_write_event(dcb);
auto session = (AvroSession*)dcb->session->router_session;
session->queue_client_callback();
}
return true;

3
server/modules/routing/avrorouter/avrorouter.hh
View File

@ -173,6 +173,8 @@ public:
*/
int routeQuery(GWBUF* buffer);
void queue_client_callback();
private:
AvroSession(Avro* instance, MXS_SESSION* session);
@ -186,7 +188,6 @@ private:
bool stream_data();
void rotate_avro_file(std::string fullname);
void client_callback();
void queue_client_callback();
};
void read_table_info(uint8_t* ptr,