Clean up avrorouter.hh
Cleaned up the header and removed most of unused member variables.
This commit is contained in:
Markus Mäkelä
@ -1,6 +1,4 @@
|
||||
#pragma once
|
||||
#ifndef _MXS_AVRO_H
|
||||
#define _MXS_AVRO_H
|
||||
/*
|
||||
* Copyright (c) 2016 MariaDB Corporation Ab
|
||||
*
|
||||
@ -38,7 +36,6 @@ MXS_BEGIN_DECLS
|
||||
/**
|
||||
* How often to call the router status function (seconds)
|
||||
*/
|
||||
#define AVRO_STATS_FREQ 60
|
||||
#define AVRO_NSTATS_MINUTES 30
|
||||
|
||||
/**
|
||||
@ -71,22 +68,22 @@ MXS_BEGIN_DECLS
|
||||
static const char *avro_client_states[] = { "Unregistered", "Registered", "Processing", "Errored" };
|
||||
static const char *avro_client_client_mode[] = { "Catch-up", "Busy", "Wait_for_data" };
|
||||
|
||||
static const char *avro_domain = "domain";
|
||||
static const char *avro_server_id = "server_id";
|
||||
static const char *avro_sequence = "sequence";
|
||||
static const char *avro_event_number = "event_number";
|
||||
static const char *avro_event_type = "event_type";
|
||||
static const char *avro_timestamp = "timestamp";
|
||||
static const char *avro_client_ouput[] = { "Undefined", "JSON", "Avro" };
|
||||
static const char *avro_domain = "domain";
|
||||
static const char *avro_server_id = "server_id";
|
||||
static const char *avro_sequence = "sequence";
|
||||
static const char *avro_event_number = "event_number";
|
||||
static const char *avro_event_type = "event_type";
|
||||
static const char *avro_timestamp = "timestamp";
|
||||
static const char *avro_client_ouput[] = { "Undefined", "JSON", "Avro" };
|
||||
|
||||
static inline bool is_reserved_word(const char* word)
|
||||
{
|
||||
return strcasecmp(word, avro_domain) == 0 ||
|
||||
strcasecmp(word, avro_server_id) == 0 ||
|
||||
strcasecmp(word, avro_sequence) == 0 ||
|
||||
return strcasecmp(word, avro_domain) == 0 ||
|
||||
strcasecmp(word, avro_server_id) == 0 ||
|
||||
strcasecmp(word, avro_sequence) == 0 ||
|
||||
strcasecmp(word, avro_event_number) == 0 ||
|
||||
strcasecmp(word, avro_event_type) == 0 ||
|
||||
strcasecmp(word, avro_timestamp) == 0;
|
||||
strcasecmp(word, avro_event_type) == 0 ||
|
||||
strcasecmp(word, avro_timestamp) == 0;
|
||||
}
|
||||
|
||||
static inline void fix_reserved_word(char *tok)
|
||||
@ -122,13 +119,13 @@ typedef enum avro_binlog_end
|
||||
typedef struct table_create
|
||||
{
|
||||
uint64_t columns;
|
||||
char **column_names;
|
||||
char **column_types;
|
||||
int* column_lengths;
|
||||
char *table;
|
||||
char *database;
|
||||
int version; /**< How many versions of this table have been used */
|
||||
bool was_used; /**< Has this schema been persisted to disk */
|
||||
char** column_names;
|
||||
char** column_types;
|
||||
int* column_lengths;
|
||||
char* table;
|
||||
char* database;
|
||||
int version; /**< How many versions of this table have been used */
|
||||
bool was_used; /**< Has this schema been persisted to disk */
|
||||
} TABLE_CREATE;
|
||||
|
||||
/** A representation of a table map event read from a binary log. A table map
|
||||
@ -137,18 +134,18 @@ typedef struct table_create
|
||||
* some meta information on the columns. */
|
||||
typedef struct table_map
|
||||
{
|
||||
uint64_t id;
|
||||
uint64_t columns;
|
||||
uint16_t flags;
|
||||
uint8_t *column_types;
|
||||
uint8_t *null_bitmap;
|
||||
uint8_t *column_metadata;
|
||||
size_t column_metadata_size;
|
||||
TABLE_CREATE *table_create; /*< The definition of the table */
|
||||
int version;
|
||||
char version_string[TABLE_MAP_VERSION_DIGITS + 1];
|
||||
char *table;
|
||||
char *database;
|
||||
uint64_t id;
|
||||
uint64_t columns;
|
||||
uint16_t flags;
|
||||
uint8_t* column_types;
|
||||
uint8_t* null_bitmap;
|
||||
uint8_t* column_metadata;
|
||||
size_t column_metadata_size;
|
||||
TABLE_CREATE* table_create; /*< The definition of the table */
|
||||
int version;
|
||||
char version_string[TABLE_MAP_VERSION_DIGITS + 1];
|
||||
char* table;
|
||||
char* database;
|
||||
} TABLE_MAP;
|
||||
|
||||
/**
|
||||
@ -156,40 +153,16 @@ typedef struct table_map
|
||||
*/
|
||||
typedef struct
|
||||
{
|
||||
int n_clients; /*< Number slave sessions created */
|
||||
int n_reads; /*< Number of record reads */
|
||||
uint64_t n_binlogs; /*< Number of binlog records from master */
|
||||
uint64_t n_rotates; /*< Number of binlog rotate events */
|
||||
int n_masterstarts; /*< Number of times connection restarted */
|
||||
time_t lastReply;
|
||||
uint64_t events[MAX_EVENT_TYPE_END + 1]; /*< Per event counters */
|
||||
uint64_t lastsample;
|
||||
int minno;
|
||||
int minavgs[AVRO_NSTATS_MINUTES];
|
||||
int n_clients; /*< Number client sessions created */
|
||||
} AVRO_ROUTER_STATS;
|
||||
|
||||
/**
|
||||
* Client statistics
|
||||
*/
|
||||
typedef struct
|
||||
{
|
||||
int n_events; /*< Number of events sent */
|
||||
unsigned long n_bytes; /*< Number of bytes sent */
|
||||
int n_requests; /*< Number of requests received */
|
||||
int n_queries; /*< Number of queries */
|
||||
int n_failed_read;
|
||||
uint64_t lastsample;
|
||||
int minno;
|
||||
int minavgs[AVRO_NSTATS_MINUTES];
|
||||
} AVRO_CLIENT_STATS;
|
||||
|
||||
typedef struct avro_table_t
|
||||
{
|
||||
char* filename; /*< Absolute filename */
|
||||
char* json_schema; /*< JSON representation of the schema */
|
||||
avro_file_writer_t avro_file; /*< Current Avro data file */
|
||||
avro_value_iface_t *avro_writer_iface; /*< Avro C API writer interface */
|
||||
avro_schema_t avro_schema; /*< Native Avro schema of the table */
|
||||
char* filename; /*< Absolute filename */
|
||||
char* json_schema; /*< JSON representation of the schema */
|
||||
avro_file_writer_t avro_file; /*< Current Avro data file */
|
||||
avro_value_iface_t* avro_writer_iface; /*< Avro C API writer interface */
|
||||
avro_schema_t avro_schema; /*< Native Avro schema of the table */
|
||||
} AVRO_TABLE;
|
||||
|
||||
/** Data format used when streaming data to the clients */
|
||||
@ -204,100 +177,79 @@ enum mxs_avro_codec_type
|
||||
{
|
||||
MXS_AVRO_CODEC_NULL,
|
||||
MXS_AVRO_CODEC_DEFLATE,
|
||||
MXS_AVRO_CODEC_SNAPPY, /**< Not yet implemented */
|
||||
MXS_AVRO_CODEC_SNAPPY, /**< Not yet implemented */
|
||||
} ;
|
||||
|
||||
typedef struct gtid_pos
|
||||
{
|
||||
uint32_t timestamp; /*< GTID event timestamp */
|
||||
uint64_t domain; /*< Replication domain */
|
||||
uint64_t server_id; /*< Server ID */
|
||||
uint64_t seq; /*< Sequence number */
|
||||
uint32_t timestamp; /*< GTID event timestamp */
|
||||
uint64_t domain; /*< Replication domain */
|
||||
uint64_t server_id; /*< Server ID */
|
||||
uint64_t seq; /*< Sequence number */
|
||||
uint64_t event_num; /*< Subsequence number, increases monotonically. This
|
||||
* is an internal representation of the position of
|
||||
* an event inside a GTID event and it is used to
|
||||
* rebuild GTID events in the correct order. */
|
||||
} gtid_pos_t;
|
||||
|
||||
struct Avro;
|
||||
|
||||
/**
|
||||
* The client structure used within this router.
|
||||
* This represents the clients that are requesting AVRO files from MaxScale.
|
||||
*/
|
||||
struct AvroSession
|
||||
{
|
||||
#if defined(SS_DEBUG)
|
||||
skygw_chk_t rses_chk_top;
|
||||
#endif
|
||||
DCB *dcb; /*< The client DCB */
|
||||
int state; /*< The state of this client */
|
||||
enum avro_data_format format; /*< Stream JSON or Avro data */
|
||||
char *uuid; /*< Client UUID */
|
||||
SPINLOCK catch_lock; /*< Event catchup lock */
|
||||
SPINLOCK file_lock; /*< Protects rses_deleted */
|
||||
Avro* router; /*< Pointer to the owning router */
|
||||
MAXAVRO_FILE *file_handle; /*< Current open file handle */
|
||||
uint64_t last_sent_pos; /*< The last record we sent */
|
||||
AVRO_CLIENT_STATS stats; /*< Slave statistics */
|
||||
time_t connect_time; /*< Connect time of slave */
|
||||
MAXAVRO_FILE avro_file; /*< Avro file struct */
|
||||
char avro_binfile[AVRO_MAX_FILENAME_LEN + 1];
|
||||
bool requested_gtid; /*< If the client requested */
|
||||
gtid_pos_t gtid; /*< Current/requested GTID */
|
||||
gtid_pos_t gtid_start; /*< First sent GTID */
|
||||
unsigned int cstate; /*< Catch up state */
|
||||
sqlite3 *sqlite_handle;
|
||||
#if defined(SS_DEBUG)
|
||||
skygw_chk_t rses_chk_tail;
|
||||
#endif
|
||||
};
|
||||
|
||||
/**
|
||||
* * The per instance data for the AVRO router.
|
||||
* */
|
||||
struct Avro
|
||||
{
|
||||
SERVICE *service; /*< Pointer to the service using this router */
|
||||
int initbinlog; /*< Initial binlog file number */
|
||||
char *fileroot; /*< Root of binlog filename */
|
||||
unsigned int state; /*< State of the AVRO router */
|
||||
uint8_t lastEventReceived; /*< Last even received */
|
||||
uint32_t lastEventTimestamp; /*< Timestamp from last event */
|
||||
char *binlogdir; /*< The directory where the binlog files are stored */
|
||||
char *avrodir; /*< The directory with the AVRO files */
|
||||
char binlog_name[BINLOG_FNAMELEN + 1];
|
||||
/*< Name of the current binlog file */
|
||||
uint64_t binlog_position;
|
||||
/*< last committed transaction position */
|
||||
uint64_t current_pos;
|
||||
/*< Current binlog position */
|
||||
int binlog_fd; /*< File descriptor of the binlog file being read */
|
||||
pcre2_code *create_table_re;
|
||||
pcre2_code *alter_table_re;
|
||||
uint8_t event_types;
|
||||
uint8_t event_type_hdr_lens[MAX_EVENT_TYPE_END];
|
||||
uint8_t binlog_checksum;
|
||||
gtid_pos_t gtid;
|
||||
TABLE_MAP *active_maps[MAX_MAPPED_TABLES];
|
||||
HASHTABLE *table_maps;
|
||||
HASHTABLE *open_tables;
|
||||
HASHTABLE *created_tables;
|
||||
sqlite3 *sqlite_handle;
|
||||
char prevbinlog[BINLOG_FNAMELEN + 1];
|
||||
int rotating; /*< Rotation in progress flag */
|
||||
SPINLOCK fileslock; /*< Lock for the files queue above */
|
||||
AVRO_ROUTER_STATS stats; /*< Statistics for this router */
|
||||
int task_delay; /*< Delay in seconds until the next conversion takes place */
|
||||
uint64_t trx_count; /*< Transactions processed */
|
||||
uint64_t trx_target; /*< Minimum about of transactions that will trigger
|
||||
* a flush of all tables */
|
||||
uint64_t row_count; /*< Row events processed */
|
||||
uint64_t row_target; /*< Minimum about of row events that will trigger
|
||||
* a flush of all tables */
|
||||
uint64_t block_size; /**< Avro datablock size */
|
||||
SERVICE* service; /*< Pointer to the service using this router */
|
||||
int initbinlog; /*< Initial binlog file number */
|
||||
char* fileroot; /*< Root of binlog filename */
|
||||
unsigned int state; /*< State of the AVRO router */
|
||||
uint8_t lastEventReceived; /*< Last even received */
|
||||
uint32_t lastEventTimestamp; /*< Timestamp from last event */
|
||||
char* binlogdir; /*< The directory where the binlog files are stored */
|
||||
char* avrodir; /*< The directory with the AVRO files */
|
||||
char binlog_name[BINLOG_FNAMELEN + 1]; /*< Name of the current binlog file */
|
||||
uint64_t binlog_position; /*< last committed transaction position */
|
||||
uint64_t current_pos; /*< Current binlog position */
|
||||
int binlog_fd; /*< File descriptor of the binlog file being read */
|
||||
pcre2_code* create_table_re;
|
||||
pcre2_code* alter_table_re;
|
||||
uint8_t event_types;
|
||||
uint8_t event_type_hdr_lens[MAX_EVENT_TYPE_END];
|
||||
uint8_t binlog_checksum;
|
||||
gtid_pos_t gtid;
|
||||
TABLE_MAP* active_maps[MAX_MAPPED_TABLES];
|
||||
HASHTABLE* table_maps;
|
||||
HASHTABLE* open_tables;
|
||||
HASHTABLE* created_tables;
|
||||
sqlite3* sqlite_handle;
|
||||
char prevbinlog[BINLOG_FNAMELEN + 1];
|
||||
int rotating; /*< Rotation in progress flag */
|
||||
AVRO_ROUTER_STATS stats; /*< Statistics for this router */
|
||||
int task_delay; /*< Delay in seconds until the next conversion takes place */
|
||||
uint64_t trx_count; /*< Transactions processed */
|
||||
uint64_t trx_target; /*< Minimum about of transactions that will trigger
|
||||
* a flush of all tables */
|
||||
uint64_t row_count; /*< Row events processed */
|
||||
uint64_t row_target; /*< Minimum about of row events that will trigger
|
||||
* a flush of all tables */
|
||||
uint64_t block_size; /**< Avro datablock size */
|
||||
enum mxs_avro_codec_type codec; /**< Avro codec type, defaults to `null` */
|
||||
struct avro_instance *next;
|
||||
};
|
||||
|
||||
struct AvroSession
|
||||
{
|
||||
DCB* dcb; /*< The client DCB */
|
||||
int state; /*< The state of this client */
|
||||
enum avro_data_format format; /*< Stream JSON or Avro data */
|
||||
char* uuid; /*< Client UUID */
|
||||
SPINLOCK catch_lock; /*< Event catchup lock */
|
||||
SPINLOCK file_lock; /*< Protects rses_deleted */
|
||||
Avro* router; /*< Pointer to the owning router */
|
||||
MAXAVRO_FILE* file_handle; /*< Current open file handle */
|
||||
uint64_t last_sent_pos; /*< The last record we sent */
|
||||
time_t connect_time; /*< Connect time of slave */
|
||||
MAXAVRO_FILE avro_file; /*< Avro file struct */
|
||||
char avro_binfile[AVRO_MAX_FILENAME_LEN + 1];
|
||||
bool requested_gtid; /*< If the client requested */
|
||||
gtid_pos_t gtid; /*< Current/requested GTID */
|
||||
gtid_pos_t gtid_start; /*< First sent GTID */
|
||||
unsigned int cstate; /*< Catch up state */
|
||||
sqlite3* sqlite_handle;
|
||||
};
|
||||
|
||||
extern void read_table_info(uint8_t *ptr, uint8_t post_header_len, uint64_t *table_id,
|
||||
@ -350,5 +302,3 @@ extern void avro_flush_all_tables(Avro *router, enum avrorouter_file_op flush);
|
||||
#define AVRO_WAIT_DATA 0x0002
|
||||
|
||||
MXS_END_DECLS
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user