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

Convert avrorouter objects to C++

Browse Source 
The instance and session objects are now C++ structs. The next pointers
for the sessions was removed as it is not the appropriate place to store
this information. This means that the client notification functionality is
broken in this commit.
This commit is contained in:
Markus Mäkelä
2018-05-22 09:28:53 +03:00
parent 354e9aeefc
commit 3095b18b14
7 changed files with 101 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/routing/avrorouter/avro_index.cc
View File

@ -24,7 +24,7 @@
* The index is stored as an SQLite3 database.
*/
#include "avrorouter.h"
#include "avrorouter.hh"
#include <maxscale/debug.h>
#include <glob.h>
@ -62,7 +62,7 @@ int index_query_cb(void *data, int rows, char** values, char** names)
return 0;
}
void avro_index_file(AVRO_INSTANCE *router, const char* filename)
void avro_index_file(Avro *router, const char* filename)
{
MAXAVRO_FILE *file = maxavro_file_open(filename);
@ -178,7 +178,7 @@ void avro_index_file(AVRO_INSTANCE *router, const char* filename)
* manner.
* @param data The router instance
*/
void avro_update_index(AVRO_INSTANCE* router)
void avro_update_index(Avro* router)
{
char path[PATH_MAX + 1];
snprintf(path, sizeof(path), "%s/*.avro", router->avrodir);
@ -209,7 +209,7 @@ static const char *insert_sql = "INSERT OR IGNORE INTO " MEMORY_TABLE_NAME
* @param router Avro router instance
* @param table Table to add
*/
void add_used_table(AVRO_INSTANCE* router, const char* table)
void add_used_table(Avro* router, const char* table)
{
char sql[AVRO_SQL_BUFFER_SIZE], *errmsg;
snprintf(sql, sizeof(sql), insert_sql, router->gtid.domain, router->gtid.server_id,
@ -232,7 +232,7 @@ void add_used_table(AVRO_INSTANCE* router, const char* table)
*
* @param router Avro router instance
*/
void update_used_tables(AVRO_INSTANCE* router)
void update_used_tables(Avro* router)
{
char *errmsg;